Bug 576218 - Over 99 tab indicator has lost the +

Change-Id: Icaaf906bc43ca6cdc530aa4fad5cc1cbfa548e95
Signed-off-by: Niraj Modi <[email protected]>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/185837
Reviewed-by: Jörg Kubitz <[email protected]>
Tested-by: Platform Bot <[email protected]>

Author: niraj-modi

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

@@ -192,6 +192,16 @@ protected void checkSubclass () {
 	if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
 }
 
+@Override
+public void layout (boolean changed) {
+	checkWidget ();
+	// 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) {
 	int count = (int)OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0);
 	if (count == this._count && wHint == this._wHint && hHint == this._hHint) {

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2021 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -739,6 +739,12 @@ public void setImage (Image image) {
 	checkWidget();
 	if ((style & SWT.SEPARATOR) != 0) return;
 	if (image != null && image.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
+	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());
+	}
+	parent.layout(changed);
 	super.setImage (image);
 	updateImages (getEnabled () && parent.getEnabled ());
 }