Revision: 2014
http://vexi.svn.sourceforge.net/vexi/?rev=2014&view=rev
Author: clrg
Date: 2007-07-31 06:11:37 -0700 (Tue, 31 Jul 2007)
Log Message:
-----------
Tidier constraining logic
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-31 11:01:19 UTC
(rev 2013)
+++ core/trunk/org.vexi.core/src/org/vexi/core/Box.jpp 2007-07-31 13:11:37 UTC
(rev 2014)
@@ -400,16 +400,14 @@
// remember current size
int oldwidth = contentwidth, oldheight = contentheight;
+ contentwidth = 0;
+ contentheight = 0;
- if (!test(PACK)) {
- contentwidth = 0;
- contentheight = 0;
-
- } else {
+ // non-packing parents clip contents
+ if (test(PACK)) {
//#repeat width/height HORIZONTAL/VERTICAL
// accumulate child contentwidth
if (test(ORIENT) == HORIZONTAL) {
- contentwidth = 0;
int i = 0;
for (Box c = getChild(0); c != null; c = getChild(++i)) {
if (!c.test(DISPLAY)) continue;
@@ -418,7 +416,6 @@
// maximum child contentwidth
} else {
- contentwidth = 0;
int i = 0;
for (Box c = getChild(0); c != null; c = getChild(++i)) {
if (!c.test(DISPLAY)) continue;
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: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
