Reece Dunn : comctl32: Don' t draw the theme background of the group box over it's content area.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9368972866de77ceea06c93e45ce9dbf8e15180d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9368972866de77ceea06c93e45...

Author: Reece Dunn <msclrhd(a)googlemail.com>
Date:   Fri Nov  7 00:11:52 2008 +0000

comctl32: Don't draw the theme background of the group box over it's content area.

Hi,

Some applications (e.g. Cepstral SwiftTalker) have dialogs that
contain controls that are ordered before the group box that contains
them. The current rendering of themed group boxes will draw it's
background over the content area, hiding any controls that have
already been drawn. XP with the default and other custom themes
correctly shows controls beneath the group box.

This patch excludes the group box content area from being drawn to, so
that any controls that have already been drawn do not get overridden.

- Reece
> From 889e477bcb4561565b8caaf41c88c5fe7d83b8d2 Mon Sep 17 00:00:00 2001
> From: Reece Dunn <msclrhd(a)gmail.com>
> Date: Fri, 7 Nov 2008 00:11:52 +0000
> Subject: [PATCH] comctl32: don't draw the theme background of the group box over it's content area.

---

 dlls/comctl32/theme_button.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c
index a6e80d1..7d389c7 100644
--- a/dlls/comctl32/theme_button.c
+++ b/dlls/comctl32/theme_button.c
@@ -181,7 +181,7 @@ static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN
 {
     static const int states[] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL };
 
-    RECT bgRect, textRect;
+    RECT bgRect, textRect, contentRect;
     HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0);
     HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL;
     int state = states[ drawState ];
@@ -198,9 +198,12 @@ static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN
         textRect.left += 10;
         textRect.bottom = textRect.top + textExtent.cy;
         textRect.right = textRect.left + textExtent.cx + 4;
+
+        ExcludeClipRect(hDC, textRect.left, textRect.top, textRect.right, textRect.bottom);
     }
 
-    ExcludeClipRect(hDC, textRect.left, textRect.top, textRect.right, textRect.bottom);
+    GetThemeBackgroundContentRect(theme, hDC, BP_GROUPBOX, state, &bgRect, &contentRect);
+    ExcludeClipRect(hDC, contentRect.left, contentRect.top, contentRect.right, contentRect.bottom);
 
     if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state))
         DrawThemeParentBackground(hwnd, hDC, NULL);