Revision: 4634
http://sourceforge.net/p/vexi/code/4634
Author: clrg
Date: 2013-12-25 01:44:42 +0000 (Wed, 25 Dec 2013)
Log Message:
-----------
Modified Paths:
--------------
branches/vexi4c/org.vexi-core.main/src/main/java/org/vexi/core/Desktop.java
branches/vexi4c/org.vexi-core.main/src/main/jpp/org/vexi/ui/Box.jpp
Modified:
branches/vexi4c/org.vexi-core.main/src/main/java/org/vexi/core/Desktop.java
===================================================================
--- branches/vexi4c/org.vexi-core.main/src/main/java/org/vexi/core/Desktop.java
2013-12-24 03:19:36 UTC (rev 4633)
+++ branches/vexi4c/org.vexi-core.main/src/main/java/org/vexi/core/Desktop.java
2013-12-25 01:44:42 UTC (rev 4634)
@@ -18,13 +18,6 @@
static private Desktop singleton;
static public Desktop get() throws JSExn {
if (singleton==null) {
- try {
- Class.forName("java.awt.Desktop");
- } catch (ClassNotFoundException e) {
- }
- if (!java.awt.Desktop.isDesktopSupported()) {
- throw new JSExn("Desktop not supported");
- }
singleton = new Desktop();
}
return singleton;
Modified: branches/vexi4c/org.vexi-core.main/src/main/jpp/org/vexi/ui/Box.jpp
===================================================================
--- branches/vexi4c/org.vexi-core.main/src/main/jpp/org/vexi/ui/Box.jpp
2013-12-24 03:19:36 UTC (rev 4633)
+++ branches/vexi4c/org.vexi-core.main/src/main/jpp/org/vexi/ui/Box.jpp
2013-12-25 01:44:42 UTC (rev 4634)
@@ -962,8 +962,8 @@
if (!child.test(DISPLAY)) {
continue;
}
+ num_active++;
final int child_nomheight =
child.nominalHeight();
- num_active++;
if (child.test(VSHRINK) ||
child.maxheight==child_nomheight) {
num_passive++;
totalsize += child_nomheight;
@@ -1046,10 +1046,11 @@
child_width = child.getTargetWidth(width);
child_x = child.getTargetX(width, child_width,
left, right);
// height, y
- totalsize += (float)max(prior_margin,
child.margin.left);
+ totalsize += (float)max(prior_margin,
child.margin.top);
child_y = offset_y + (int)(totalsize+0.5);
- if (child.test(VSHRINK) || child.contentheight >
targetsize) {
- child_height = child.contentheight;
+ final int child_nomheight = child.nominalHeight();
+ if (child.test(VSHRINK) || child_nomheight >
targetsize) {
+ child_height = child_nomheight;
totalsize += (float)child_height;
} else if (targetsize > child.maxheight) {
child_height = child.maxheight;
@@ -1060,7 +1061,7 @@
totalsize += targetsize;
}
child.tryMoveAndResize(child_x, child_y,
child_width, child_height, clean);
- prior_margin = child.margin.right;
+ prior_margin = child.margin.bottom;
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
