Revision: 4544
http://sourceforge.net/p/vexi/code/4544
Author: clrg
Date: 2013-08-30 13:42:46 +0000 (Fri, 30 Aug 2013)
Log Message:
-----------
Explicit variable names
Modified Paths:
--------------
branches/vexi3/org.vexi-core.main/src/main/jpp/org/vexi/core/Box.jpp
Modified: branches/vexi3/org.vexi-core.main/src/main/jpp/org/vexi/core/Box.jpp
===================================================================
--- branches/vexi3/org.vexi-core.main/src/main/jpp/org/vexi/core/Box.jpp
2013-08-27 22:30:31 UTC (rev 4543)
+++ branches/vexi3/org.vexi-core.main/src/main/jpp/org/vexi/core/Box.jpp
2013-08-30 13:42:46 UTC (rev 4544)
@@ -614,8 +614,8 @@
return;
}
- // remember current size
- int newwidth = 0, newheight = 0;
+ // establish new content size
+ int new_contentwidth = 0, new_contentheight = 0;
if (test(PACK)) {
//#repeat width/height HORIZONTAL/VERTICAL
if (test(ORIENT) == HORIZONTAL) {
@@ -624,7 +624,7 @@
if (!c.test(DISPLAY)) {
continue;
}
- newwidth += c.contentwidth;
+ new_contentwidth += c.contentwidth;
}
} else {
// maximum child contentwidth
@@ -632,7 +632,7 @@
if (!c.test(DISPLAY)) {
continue;
}
- newwidth = max(newwidth, c.contentwidth);
+ new_contentwidth = max(new_contentwidth, c.contentwidth);
}
}
//#end
@@ -642,48 +642,49 @@
if (!c.test(DISPLAY)) {
continue;
}
- newwidth = max(newwidth, c.contentwidth);
- newheight = max(newheight, c.contentheight);
+ new_contentwidth = max(new_contentwidth, c.contentwidth);
+ new_contentheight = max(new_contentheight, c.contentheight);
}
}
//#repeat width/height WIDTH/HEIGHT
if (test(CLIP)) {
- if (newwidth < maxwidth && newwidth < minwidth) {
+ if (new_contentwidth < maxwidth && new_contentwidth < minwidth) {
set(HAS_WIDTH_SLACK);
} else {
clear(HAS_WIDTH_SLACK);
}
} else {
- if (newwidth < maxwidth && (newwidth < minwidth || newwidth <
renderprops.textwidth || (renderprops.texture!=null && newwidth <
renderprops.texture.width))) {
+ if (new_contentwidth < maxwidth && (new_contentwidth < minwidth ||
new_contentwidth < renderprops.textwidth ||
+ (renderprops.texture!=null && new_contentwidth <
renderprops.texture.width))) {
set(HAS_WIDTH_SLACK);
} else {
clear(HAS_WIDTH_SLACK);
}
// constrain contentwidth
if (renderprops.texture != null) {
- newwidth = max(newwidth, renderprops.texture.width);
+ new_contentwidth = max(new_contentwidth,
renderprops.texture.width);
}
- newwidth = max(newwidth, renderprops.textwidth);
+ new_contentwidth = max(new_contentwidth, renderprops.textwidth);
}
- newwidth = min(maxwidth, max(minwidth, newwidth));
+ new_contentwidth = min(maxwidth, max(minwidth, new_contentwidth));
// assign contentwidth and mark for place in parent and placing of
children
- if (newwidth != contentwidth) {
+ if (new_contentwidth != contentwidth) {
if (parent != null) {
setPlaceInTree();
parent.set(PLACE);
parent.set(CONSTRAIN); // parent already in constrain()
-
PUT_BOX_FIELD(SC_contentwidth,JSU.N(newwidth),contentwidth=newwidth,CONTENTWIDTH_TRAP)
+
PUT_BOX_FIELD(SC_contentwidth,JSU.N(new_contentwidth),contentwidth=new_contentwidth,CONTENTWIDTH_TRAP)
} else {
// constrain contentwidth to frame width
if (getSurface()!=null && !test(SHRINK)) {
- newwidth = min(getSurface().pendingWidth, newwidth);
+ new_contentwidth = min(getSurface().pendingWidth,
new_contentwidth);
}
- if (newwidth != contentwidth) {
+ if (new_contentwidth != contentwidth) {
setPlaceInTree();
-
PUT_BOX_FIELD(SC_contentwidth,JSU.N(newwidth),contentwidth=newwidth,CONTENTWIDTH_TRAP)
+
PUT_BOX_FIELD(SC_contentwidth,JSU.N(new_contentwidth),contentwidth=new_contentwidth,CONTENTWIDTH_TRAP)
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
