Return Point.OfFloat in Label:computeSize

This commit adapts Label to return Point.OfFloat object on
Label:computeSizeInPixels ultimately returning Point.OfFloat on calling
Label:computeSize. This allows precise scaling of Label by its parents.

contributes to #2166

Author: amartya4256

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridData.java

@@ -399,8 +399,8 @@ public final class GridData {
 	public static final int FILL_BOTH = FILL_VERTICAL | FILL_HORIZONTAL;
 
 	float cacheWidth = -1, cacheHeight = -1;
-	float defaultWhint, defaultHhint, defaultWidth = -1, defaultHeight = -1;
-	float currentWhint, currentHhint, currentWidth = -1, currentHeight = -1;
+	int defaultWhint, defaultHhint, currentWhint, currentHhint;
+	float defaultWidth = -1, defaultHeight = -1, currentWidth = -1, currentHeight = -1;
 
 /**
  * Constructs a new instance of GridData using

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridLayout.java

@@ -334,25 +334,19 @@ Point layout (Composite composite, boolean move, int x, int y, int width, int he
 					if (w > 0) {
 						if (makeColumnsEqualWidth) {
 							float equalWidth = (w + spanWidth) / hSpan;
-							float remainder = (w + spanWidth) % hSpan;
-							int last = -1;
 							for (int k = 0; k < hSpan; k++) {
-								widths [last=j-k] = Math.max (equalWidth, widths [j-k]);
+								widths [j-k] = Math.max (equalWidth, widths [j-k]);
 							}
-							if (last > -1) widths [last] += remainder;
 						} else {
 							if (spanExpandCount == 0) {
 								widths [j] += w;
 							} else {
 								float delta = w / spanExpandCount;
-								float remainder = w % spanExpandCount;
-								int last = -1;
 								for (int k = 0; k < hSpan; k++) {
 									if (expandColumn [j-k]) {
-										widths [last=j-k] += delta;
+										widths [j-k] += delta;
 									}
 								}
-								if (last > -1) widths [last] += remainder;
 							}
 						}
 					}
@@ -364,14 +358,11 @@ Point layout (Composite composite, boolean move, int x, int y, int width, int he
 								minWidths [j] += w;
 							} else {
 								float delta = w / spanExpandCount;
-								float remainder = w % spanExpandCount;
-								int last = -1;
 								for (int k = 0; k < hSpan; k++) {
 									if (expandColumn [j-k]) {
-										minWidths [last=j-k] += delta;
+										minWidths [j-k] += delta;
 									}
 								}
-								if (last > -1) minWidths [last] += remainder;
 							}
 						}
 					}
@@ -434,14 +425,11 @@ Point layout (Composite composite, boolean move, int x, int y, int width, int he
 											widths [j] += w;
 										} else {
 											float delta2 = w / spanExpandCount;
-											float remainder2 = w % spanExpandCount;
-											int last2 = -1;
 											for (int k = 0; k < hSpan; k++) {
 												if (expandColumn [j-k]) {
-													widths [last2=j-k] += delta2;
+													widths [j-k] += delta2;
 												}
 											}
-											if (last2 > -1) widths [last2] += remainder2;
 										}
 									}
 								}
@@ -547,14 +535,11 @@ Point layout (Composite composite, boolean move, int x, int y, int width, int he
 							heights [i] += h;
 						} else {
 							float delta = h / spanExpandCount;
-							float remainder = h % spanExpandCount;
-							int last = -1;
 							for (int k = 0; k < vSpan; k++) {
 								if (expandRow [i-k]) {
-									heights [last=i-k] += delta;
+									heights [i-k] += delta;
 								}
 							}
-							if (last > -1) heights [last] += remainder;
 						}
 					}
 					if (!data.grabExcessVerticalSpace || data.minimumHeight != 0) {
@@ -565,14 +550,11 @@ Point layout (Composite composite, boolean move, int x, int y, int width, int he
 								minHeights [i] += h;
 							} else {
 								float delta = h / spanExpandCount;
-								float remainder = h % spanExpandCount;
-								int last = -1;
 								for (int k = 0; k < vSpan; k++) {
 									if (expandRow [i-k]) {
-										minHeights [last=i-k] += delta;
+										minHeights [i-k] += delta;
 									}
 								}
-								if (last > -1) minHeights [last] += remainder;
 							}
 						}
 					}
@@ -622,14 +604,11 @@ Point layout (Composite composite, boolean move, int x, int y, int width, int he
 										heights [i] += h;
 									} else {
 										float delta2 = h / spanExpandCount;
-										float remainder2 = h % spanExpandCount;
-										int last2 = -1;
 										for (int k = 0; k < vSpan; k++) {
 											if (expandRow [i-k]) {
-												heights [last2=i-k] += delta2;
+												heights [i-k] += delta2;
 											}
 										}
-										if (last2 > -1) heights [last2] += remainder2;
 									}
 								}
 							}

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java

@@ -179,7 +179,7 @@ static int checkStyle (int style) {
 	if (hHint != SWT.DEFAULT) height = hHint;
 	width += border * 2;
 	height += border * 2;
-	return new Point (width, height);
+	return new Point.OfFloat (width, height);
 }
 
 @Override