Added code to deal with left-over pixels that may occur due to rounding

error when the number of free components doesn't divide evenly into the
number of pixels they need to occupy.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@345 6335cc39-0255-0410-8fd6-9bcaacd3b74c

projects/samskivert/src/java/com/samskivert/swing/HGroupLayout.java

@@ -1,5 +1,5 @@
 //
-// $Id: HGroupLayout.java,v 1.6 2001/08/11 22:43:28 mdb Exp $
+// $Id: HGroupLayout.java,v 1.7 2001/10/09 19:21:37 mdb Exp $
 //
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001 Michael Bayne
@@ -99,12 +99,19 @@ public class HGroupLayout extends GroupLayout
 	int totwid, totgap = _gap * (info.count-1);
 	int freecount = info.count - info.numfix;
 
+        // when stretching, there is the possibility that a pixel or more
+        // will be lost to rounding error. we account for that here and
+        // assign the extra space to the first free component
+        int freefrac = 0;
+
 	// do the on-axis policy calculations
 	int defwid = 0;
 	switch (_policy) {
 	case STRETCH:
 	    if (freecount > 0) {
-		defwid = (b.width - info.fixwid - totgap) / freecount;
+                int freewid = b.width - info.fixwid - totgap;
+                defwid = freewid / freecount;
+                freefrac = freewid % freecount;
 		totwid = b.width;
 	    } else {
 		totwid = info.fixwid + totgap;
@@ -157,16 +164,21 @@ public class HGroupLayout extends GroupLayout
 	    }
 
 	    Component child = parent.getComponent(i);
-	    int newwid = defwid;
+	    int newwid, newhei;
-	    int newhei = defhei;
 
 	    if (_policy == NONE || isFixed(child)) {
 		newwid = info.dimens[i].width;
-	    }
+	    } else {
+                newwid = defwid + freefrac;
+                // clear out the extra pixels the first time they're used
+                freefrac = 0;
+            }
 
 	    if (_offpolicy == NONE) {
 		newhei = info.dimens[i].height;
-	    }
+	    } else {
+                newhei = defhei;
+            }
 
             // determine our off-axis position
             switch (_offjust) {

projects/samskivert/src/java/com/samskivert/swing/VGroupLayout.java

@@ -1,5 +1,5 @@
 //
-// $Id: VGroupLayout.java,v 1.6 2001/08/11 22:43:29 mdb Exp $
+// $Id: VGroupLayout.java,v 1.7 2001/10/09 19:21:37 mdb Exp $
 //
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001 Michael Bayne
@@ -99,12 +99,19 @@ public class VGroupLayout extends GroupLayout
 	int tothei, totgap = _gap * (info.count-1);
 	int freecount = info.count - info.numfix;
 
-	// do the on-axis policy calculations
+        // when stretching, there is the possibility that a pixel or more
+        // will be lost to rounding error. we account for that here and
+        // assign the extra space to the first free component
+        int freefrac = 0;
+
+        // do the on-axis policy calculations
 	int defhei = 0;
 	switch (_policy) {
 	case STRETCH:
 	    if (freecount > 0) {
-		defhei = (b.height - info.fixhei - totgap) / freecount;
+                int freehei = b.height - info.fixhei - totgap;
+                defhei = freehei / freecount;
+                freefrac = freehei % freecount;
 		tothei = b.height;
 	    } else {
 		tothei = info.fixhei + totgap;
@@ -157,16 +164,21 @@ public class VGroupLayout extends GroupLayout
 	    }
 
 	    Component child = parent.getComponent(i);
-	    int newhei = defhei;
+	    int newwid, newhei;
-	    int newwid = defwid;
 
 	    if (_policy == NONE || isFixed(child)) {
 		newhei = info.dimens[i].height;
-	    }
+	    } else {
+                newhei = defhei + freefrac;
+                // clear out the extra pixels the first time they're used
+                freefrac = 0;
+            }
 
 	    if (_offpolicy == NONE) {
 		newwid = info.dimens[i].width;
-	    }
+	    } else {
+                newwid = defwid;
+            }
 
             // determine our off-axis position
             switch (_offjust) {