Revision: 1959
http://svn.sourceforge.net/vexi/?rev=1959&view=rev
Author: clrg
Date: 2007-07-08 21:51:36 -0700 (Sun, 08 Jul 2007)
Log Message:
-----------
Fix broken requestReflow function and remove duplication in "text" put
Modified Paths:
--------------
core/trunk/org.vexi.core/src/org/vexi/core/Box.jpp
Modified: core/trunk/org.vexi.core/src/org/vexi/core/Box.jpp
===================================================================
--- core/trunk/org.vexi.core/src/org/vexi/core/Box.jpp 2007-07-09 04:09:01 UTC
(rev 1958)
+++ core/trunk/org.vexi.core/src/org/vexi/core/Box.jpp 2007-07-09 04:51:36 UTC
(rev 1959)
@@ -359,10 +359,10 @@
b2.set(PLACE_DESCENDENT);
}
private final void requestReflow() {
- if (test(CONSTRAIN_DESCENDENT)) setConstrainInTree();
- else if (test(CONSTRAIN) && parent != null)
parent.setConstrainInTree();
- if (test(PLACE_DESCENDENT)) setPlaceInTree();
- else if (test(PLACE) && parent != null) parent.setPlaceInTree();
+ if (test(CONSTRAIN) || test(CONSTRAIN_DESCENDENT))
+ setConstrainInTree();
+ if (test(PLACE) || test(PLACE_DESCENDENT))
+ setPlaceInTree();
}
/** should only be invoked on the root box */
@@ -1268,10 +1268,6 @@
if (display) {
set(DISPLAY);
requestReflow();
- if (test(CONSTRAIN_DESCENDENT)) setConstrainInTree();
- else if (test(CONSTRAIN) && parent != null)
parent.setConstrainInTree();
- if (test(PLACE_DESCENDENT)) setPlaceInTree();
- else if (test(PLACE) && parent != null)
parent.setPlaceInTree();
} else {
clear(DISPLAY);
setParentConstrain();
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 DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
