Fixed: failed to re-prepare text after content dependent script changed

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@482 0fc631ac-6414-0410-93d0-97cfa31319b6

src/data/field.cpp

@@ -183,8 +183,8 @@ void Style::removeListener(StyleListener* listener) {
 		listeners.end()
 		);
 }
-void Style::tellListeners() {
-	FOR_EACH(l, listeners) l->onStyleChange();
+void Style::tellListeners(bool already_prepared) {
+	FOR_EACH(l, listeners) l->onStyleChange(already_prepared);
 }
 
 StyleListener::StyleListener(const StyleP& style)

src/data/field.hpp

@@ -132,7 +132,7 @@ class Style : public IntrusivePtrVirtualBase {
 	/// Remove a StyleListener
 	void removeListener(StyleListener*);
 	/// Tell the StyleListeners that this style has changed
-	void tellListeners();
+	void tellListeners(bool already_prepared);
 	
   private:
 	DECLARE_REFLECTION_VIRTUAL();
@@ -156,7 +156,8 @@ class StyleListener : public IntrusivePtrVirtualBase {
 	virtual ~StyleListener();
 	
 	/// Called when a (scripted) property of the viewed style has changed
-	virtual void onStyleChange() {}
+	/** already_prepared indicates that this change happend after preparing text for content properties */
+	virtual void onStyleChange(bool already_prepared) {}
   protected:
 	const StyleP styleP; ///< The style we are listening to
 };

src/data/field/choice.cpp

@@ -252,7 +252,7 @@ void ChoiceStyle::invalidate(Context& ctx) {
 			thumbnails_status[i] = THUMB_CHANGED;
 		}
 	}
-	if (change) tellListeners();
+	if (change) tellListeners(false);
 }
 
 void ChoiceStyle::loadMask(Package& pkg) {