Improve the progress bar's block size by *.668

jossonsmith · jossonsmith · commit 0b96b8d3e279 · 2006-08-12T09:14:03.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ProgressBar.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ProgressBar.java
@@ -404,14 +404,15 @@ public void setSelection (int value) {
 }
 
 protected void updateSelection(int selection) {
-	int blockSize = 9;
-	int w = ((style & SWT.HORIZONTAL) != 0) ?  width : height;
+	boolean isHr = (style & SWT.HORIZONTAL) != 0;
+	int w = isHr ? width : height;
+	int blockSize = Math.round((isHr ? height : width) * 0.668f) - 2; // 9
 	w = Math.round((w - 2) * selection / maximum);
 	if (w < 0) {
 		w = 0;
 	}
 	if ((style & SWT.SMOOTH) != 0) {
-		if ((style & SWT.HORIZONTAL) != 0) {
+		if (isHr) {
 			innerHandles[0].style.width = w + "px";
 			innerHandles[0].style.height = ((height - 2) < 0 ? 0 : height - 2) + "px";
 		} else {
@@ -433,7 +434,7 @@ protected void updateSelection(int selection) {
 			if (el == null) {
 				el = document.createElement("DIV");
 				handle.appendChild(el);
-				if ((style & SWT.HORIZONTAL) != 0) {
+				if (isHr) {
 					el.className = "progress-bar-horizontal";
 					el.style.left = (i * (blockSize + 2) + 1) + "px";
 				} else {
@@ -444,7 +445,7 @@ protected void updateSelection(int selection) {
 			} else {
 				el.style.display = "block";
 			}
-			if ((style & SWT.HORIZONTAL) != 0) {
+			if (isHr) {
 				el.style.height = ((height - 2) < 0 ? 0 : height - 2) + "px";
 				if ((i + 1) * (blockSize + 2) <= width - 2) {
 					el.style.width = blockSize + "px";
