Bug 576218 part2 - Over 99 tab indicator has lost the +

- all ToolItem#setXXX() methods need to call parent.layout(boolean)
which makes the cached ToolBar size invalid.
- Re-factoring in ToolBar

Change-Id: I95d2786142a10ecbaea683d2ec5004484fee70f5
Signed-off-by: Niraj Modi <[email protected]>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/186277
Tested-by: Platform Bot <[email protected]>

Author: niraj-modi

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

@@ -195,11 +195,15 @@ protected void checkSubclass () {
 @Override
 public void layout (boolean changed) {
 	checkWidget ();
+	clearSizeCache(changed);
+	super.layout(changed);
+}
+
+void clearSizeCache(boolean changed) {
 	// If changed, discard the cached layout information
 	if (changed) {
 		_count = _wHint = _hHint = -1;
 	}
-	super.layout(changed);
 }
 
 @Override Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
@@ -686,6 +690,7 @@ public int indexOf (ToolItem item) {
 }
 
 void layoutItems () {
+	clearSizeCache(true);
 	/*
 	* Feature in Windows.  When a tool bar has the style
 	* TBSTYLE_LIST and has a drop down item, Window leaves

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

@@ -579,6 +579,7 @@ public void setControl (Control control) {
 		if (control.parent != parent) error (SWT.ERROR_INVALID_PARENT);
 	}
 	if ((style & SWT.SEPARATOR) == 0) return;
+	parent.layout(true);
 	this.control = control;
 	/*
 	* Feature in Windows.  When a tool bar wraps, tool items
@@ -705,6 +706,7 @@ public void setDisabledImage (Image image) {
 	checkWidget();
 	if ((style & SWT.SEPARATOR) != 0) return;
 	if (image != null && image.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
+	parent.layout(isImageSizeChanged(disabledImage, image));
 	disabledImage = image;
 	updateImages (getEnabled () && parent.getEnabled ());
 }
@@ -730,6 +732,7 @@ public void setHotImage (Image image) {
 	checkWidget();
 	if ((style & SWT.SEPARATOR) != 0) return;
 	if (image != null && image.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
+	parent.layout(isImageSizeChanged(hotImage, image));
 	hotImage = image;
 	updateImages (getEnabled () && parent.getEnabled ());
 }
@@ -739,14 +742,18 @@ public void setImage (Image image) {
 	checkWidget();
 	if ((style & SWT.SEPARATOR) != 0) return;
 	if (image != null && image.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
+	parent.layout(isImageSizeChanged(super.image, image));
+	super.setImage (image);
+	updateImages (getEnabled () && parent.getEnabled ());
+}
+
+boolean isImageSizeChanged(Image oldImage, Image image) {
 	boolean changed = true;
 	// check if image size really changed for old and new images
-	if (super.image != null && !super.image.isDisposed() && image != null && !image.isDisposed()) {
-		changed = !super.image.getBounds().equals(image.getBounds());
+	if (oldImage != null && !oldImage.isDisposed() && image != null && !image.isDisposed()) {
+		changed = !oldImage.getBounds().equals(image.getBounds());
 	}
-	parent.layout(changed);
-	super.setImage (image);
-	updateImages (getEnabled () && parent.getEnabled ());
+	return changed;
 }
 
 boolean setRadioSelection (boolean value) {