29994 - Image background Composite / Transparent widget backgrounds (/*public*/)

1 files changed, 27 insertions, 2 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
index beb13d05f7..f23ba34598 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
@@ -240,6 +240,27 @@ void createHandle () {
 	}
 }
 
+/*public*/ void drawBackground (GC gc, int id, int x, int y, int width, int height) {
+	checkWidget ();
+	if (gc == null) error (SWT.ERROR_NULL_ARGUMENT);
+	if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
+	int pixel = -1;
+	switch (id) {
+		case SWT.COLOR_LIST_BACKGROUND:
+			pixel = OS.GetSysColor (OS.COLOR_WINDOW);
+			break;
+		case SWT.COLOR_INFO_BACKGROUND:
+			pixel = OS.GetSysColor (OS.COLOR_INFOBK);
+			break;
+		case SWT.COLOR_WIDGET_BACKGROUND:
+			pixel = OS.GetSysColor (OS.COLOR_3DFACE);
+			break;
+	}
+	RECT rect = new RECT ();
+	OS.SetRect (rect, x, y, x + width, y + height);
+	drawBackground (gc.handle, rect, pixel);
+}
+
 Composite findDeferredControl () {
 	return layoutCount > 0 ? this : parent.findDeferredControl ();
 }
@@ -1292,8 +1313,12 @@ LRESULT WM_SIZE (int wParam, int lParam) {
 				}
 			}
 		}
-		if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-			if (findThemeControl () != null) redrawChildren ();
+		if (backgroundImage != null) {
+			redrawChildren ();
+		} else {
+			if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
+				if (findThemeControl () != null) redrawChildren ();
+			}
 		}
 	}