93501

1 files changed, 15 insertions, 4 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
index 10c9b33646..5e4b73b44e 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
@@ -560,16 +560,27 @@ void layoutItems () {
 		OS.SendMessage (handle, OS.TB_AUTOSIZE, 0, 0);
 	}
 	/*
-	*  When the tool bar is vertical, make the width
-	*  of each button be the width of the widest.
+	*  When the tool bar is vertical, make the width of each button
+	*  be the width of the widest button in the tool bar.  Note that
+	*  when the tool bar contains a drop down item, it needs to take
+	*  into account extra padding.
 	*/
 	if ((style & SWT.VERTICAL) != 0) {
 		TBBUTTONINFO info = new TBBUTTONINFO ();
 		info.cbSize = TBBUTTONINFO.sizeof;
 		info.dwMask = OS.TBIF_SIZE;
 		int size = OS.SendMessage (handle, OS.TB_GETBUTTONSIZE, 0, 0);
-		int padding = OS.SendMessage (handle, OS.TB_GETPADDING, 0, 0);
-		info.cx = (short) ((size & 0xFFFF) + (padding & 0xFFFF) * 2);
+		info.cx = (short) (size & 0xFFFF);
+		int index = 0;
+		while (index < items.length) {
+			ToolItem item = items [index];
+			if (item != null && (item.style & SWT.DROP_DOWN) != 0) break;
+			index++;
+		}
+		if (index < items.length) {
+			int padding = OS.SendMessage (handle, OS.TB_GETPADDING, 0, 0);
+			info.cx += (padding & 0xFFFF) * 2;
+		}
 		for (int i=0; i<items.length; i++) {
 			ToolItem item = items [i];
 			if (item != null && (item.style & SWT.SEPARATOR) == 0) {