133756 - Regression in SWT.Label

1 files changed, 12 insertions, 1 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
index 40e76b79a3..5b2b05bb29 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
@@ -380,7 +380,7 @@ public void setText (String string) {
 			if ((style & SWT.WRAP) != 0) {
 				newBits |= OS.SS_LEFT;
 			} else {
-			newBits |= OS.SS_LEFTNOWORDWRAP;
+				newBits |= OS.SS_LEFTNOWORDWRAP;
 			}
 		}
 		if ((style & SWT.CENTER) != 0) newBits |= OS.SS_CENTER;
@@ -390,6 +390,17 @@ public void setText (String string) {
 	string = Display.withCrLf (string);
 	TCHAR buffer = new TCHAR (getCodePage (), string, true);
 	OS.SetWindowText (handle, buffer);
+	/*
+	* Bug in Windows.  For some reason, the HBRUSH that
+	* is returned from WM_CTRLCOLOR is misaligned when
+	* the label uses it to draw.  If the brush is a solid
+	* color, this does not matter.  However, if the brush
+	* contains an image, the image is misaligned.  The
+	* fix is to draw the background in WM_ERASEBKGND.
+	*/
+	if (OS.COMCTL32_MAJOR < 6 || !OS.IsAppThemed ()) {
+		if (findImageControl () != null) OS.InvalidateRect (handle, null, true);
+	}
 }
 
 int widgetExtStyle () {