Revision: 3060
http://vexi.svn.sourceforge.net/vexi/?rev=3060&view=rev
Author: clrg
Date: 2008-08-10 00:36:13 +0000 (Sun, 10 Aug 2008)
Log Message:
-----------
Fix font stream changes not registering when Box.text != Text.DEFAULT_TEXT
Modified Paths:
--------------
trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp
trunk/core/org.vexi.core/src/org/vexi/core/Text.java
Modified: trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp
===================================================================
--- trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp 2008-08-09 22:43:41 UTC
(rev 3059)
+++ trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp 2008-08-10 00:36:13 UTC
(rev 3060)
@@ -1205,7 +1205,7 @@
if (value!=null && JSU.getFountain(value)==null && !(value
instanceof Blessing))
throw new JSExn("Attempt to put a non-stream to the 'font'
property of a box");
Fountain fontstream = value==null ? null :
(Fountain)value.unclone();
- if ((value==null && !text.setstream) || text.font.stream ==
fontstream) return;
+ if ((value==null && !text.streamset) || text.font.stream ==
fontstream) return;
if (!text.isEmpty()) { setConstrain(); dirty(); }
text = text.setStream(fontstream);
case "fontsize":
Modified: trunk/core/org.vexi.core/src/org/vexi/core/Text.java
===================================================================
--- trunk/core/org.vexi.core/src/org/vexi/core/Text.java 2008-08-09
22:43:41 UTC (rev 3059)
+++ trunk/core/org.vexi.core/src/org/vexi/core/Text.java 2008-08-10
00:36:13 UTC (rev 3060)
@@ -105,7 +105,7 @@
//////// INSTANCE PROPERTIES /////////////////////////////////////
- boolean setstream = false;
+ boolean streamset = false;
public int pointsize = 0;
int color = DEFAULT_COLOR;
int width = 0;
@@ -121,7 +121,7 @@
/** construct new text object based on font from 'stream' of size
'pointsize' */
Text(JS stream, int pointsize) {
- this.setstream = stream!=null;
+ this.streamset = stream!=null;
this.pointsize = pointsize;
setFont(stream);
}
@@ -182,7 +182,8 @@
return new Text(stream, 0);
}
// null means use the default
- setstream = stream!=null;
+ streamset = stream!=null;
+ setFont(stream);
calculateDimensions();
return this;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
