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() {
+void Style::tellListeners(bool already_prepared) {
-	FOR_EACH(l, listeners) l->onStyleChange();
+	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) {

src/render/card/viewer.cpp

@@ -83,7 +83,7 @@ void DataViewer::updateStyles(bool only_content_dependent) {
 				Style& s = *v->getStyle();
 				if (only_content_dependent && !s.content_dependent) continue;
 				if (s.update(ctx)) {
-					s.tellListeners();
+					s.tellListeners(only_content_dependent);
 				}
 			}
 		}

src/render/text/viewer.cpp

@@ -146,6 +146,9 @@ void TextViewer::reset() {
 	elements.clear();
 	lines.clear();
 }
+bool TextViewer::prepared() const {
+	return !lines.empty();
+}
 
 // ----------------------------------------------------------------------------- : Positions
 

src/render/text/viewer.hpp

@@ -58,6 +58,8 @@ class TextViewer {
 	bool prepare(RotatedDC& dc, const String& text, TextStyle& style, Context&);
 	/// Reset the cached data, at a new call to draw it will be recalculated
 	void reset();
+	/// Is the viewer prepare()d?
+	bool prepared() const;
 	
 	// --------------------------------------------------- : Positions
 	

src/render/value/choice.cpp

@@ -72,6 +72,6 @@ void ChoiceValueViewer::draw(RotatedDC& dc) {
 	}
 }
 
-void ChoiceValueViewer::onStyleChange() {
+void ChoiceValueViewer::onStyleChange(bool already_prepared) {
-	viewer.redraw(*this);
+	if (!already_prepared) viewer.redraw(*this);
 }

src/render/value/choice.hpp

@@ -21,7 +21,7 @@ class ChoiceValueViewer : public ValueViewer {
 	DECLARE_VALUE_VIEWER(Choice) : ValueViewer(parent,style) {}
 	
 	virtual void draw(RotatedDC& dc);
-	virtual void onStyleChange();
+	virtual void onStyleChange(bool);
 };
 
 // ----------------------------------------------------------------------------- : EOF

src/render/value/color.cpp

@@ -86,9 +86,9 @@ bool ColorValueViewer::containsPoint(const RealPoint& p) const {
 	}
 }
 
-void ColorValueViewer::onStyleChange() {
+void ColorValueViewer::onStyleChange(bool already_prepared) {
 	alpha_mask = AlphaMaskP();
-	viewer.redraw(*this);
+	if (!already_prepared) viewer.redraw(*this);
 }
 
 void ColorValueViewer::loadMask(const Rotation& rot) const {

src/render/value/color.hpp

@@ -25,7 +25,7 @@ class ColorValueViewer : public ValueViewer {
 	virtual void draw(RotatedDC& dc);
 	virtual bool containsPoint(const RealPoint& p) const;
 	
-	virtual void onStyleChange();
+	virtual void onStyleChange(bool);
 	
   private:
 	mutable AlphaMaskP alpha_mask;

src/render/value/image.cpp

@@ -77,10 +77,10 @@ void ImageValueViewer::onValueChange() {
 	bitmap = Bitmap();
 }
 
-void ImageValueViewer::onStyleChange() {
+void ImageValueViewer::onStyleChange(bool already_prepared) {
 	bitmap = Bitmap();
 	alpha_mask = AlphaMaskP(); // TODO: only reload whatever has changed
-	viewer.redraw(*this);
+	if (!already_prepared) viewer.redraw(*this);
 }
 
 void ImageValueViewer::loadMask(const Rotation& rot) const {

src/render/value/image.hpp

@@ -27,7 +27,7 @@ class ImageValueViewer : public ValueViewer {
 	virtual bool containsPoint(const RealPoint& p) const;
 	
 	virtual void onValueChange();
-	virtual void onStyleChange();
+	virtual void onStyleChange(bool);
 			
   private:
 	Bitmap bitmap;

src/render/value/text.cpp

@@ -21,12 +21,14 @@ bool TextValueViewer::prepare(RotatedDC& dc) {
 			style().mask.load(image);
 		}
 	}
-	v.prepare(dc, value().value(), style(), viewer.getContext());
+	return v.prepare(dc, value().value(), style(), viewer.getContext());
-	return true;
 }
 
 void TextValueViewer::draw(RotatedDC& dc) {
 	drawFieldBorder(dc);
+	if (!v.prepared()) {
+		v.prepare(dc, value().value(), style(), viewer.getContext());
+	}
 	v.draw(dc, style(), (DrawWhat)(
 		  DRAW_NORMAL
 		| (viewer.drawBorders()              ? DRAW_BORDERS : 0)
@@ -38,7 +40,7 @@ void TextValueViewer::onValueChange() {
 	v.reset();
 }
 
-void TextValueViewer::onStyleChange() {
+void TextValueViewer::onStyleChange(bool already_prepared) {
 	v.reset();
-	viewer.redraw(*this);
+	if (!already_prepared) viewer.redraw(*this);
 }

src/render/value/text.hpp

@@ -24,7 +24,7 @@ class TextValueViewer : public ValueViewer {
 	virtual bool prepare(RotatedDC& dc);
 	virtual void draw(RotatedDC& dc);
 	virtual void onValueChange();
-	virtual void onStyleChange();
+	virtual void onStyleChange(bool);
 	
   protected:
 	TextViewer v;

src/render/value/viewer.hpp

@@ -57,7 +57,8 @@ class ValueViewer : public StyleListener {
 	 */
 	virtual void onValueChange() {}
 	/// Called when a (scripted) property of the associated style has changed
-	virtual void onStyleChange() {}
+	/** If alread_prepared, should make sure the viewer stays in a state similair to that after prepare() */
+	virtual void onStyleChange(bool already_prepared) {}
 	/// Called when an action is performed on the associated value
 	virtual void onAction(const Action&, bool undone) { onValueChange(); }
 	

src/script/script_manager.cpp

@@ -226,7 +226,7 @@ void SetScriptManager::updateStyles(Context& ctx, const IndexMap<FieldP,StyleP>&
 		try {
 			if (s->update(ctx)) {
 				// style has changed, tell listeners
-				s->tellListeners();
+				s->tellListeners(only_content_dependent);
 			}
 		} catch (const ScriptError& e) {
 			throw ScriptError(e.what() + _("\n  while updating styles for '") + s->fieldP->name + _("'"));