Zhiyi Zhang : comctl32/status: Calculate border for part background only when theming is off.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1cdea98b18c1c4f9ea9827e9a377a45e8731b5a5
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1cdea98b18c1c4f9ea9827e9a...

Author: Zhiyi Zhang <zzhang(a)codeweavers.com>
Date:   Thu Jan 20 15:17:48 2022 +0800

comctl32/status: Calculate border for part background only when theming is off.

This is a no-op.

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/comctl32/status.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index 786fcbd291d..6fcdc32086a 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -144,16 +144,12 @@ static void
 STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART *part, int itemID)
 {
     RECT r = part->bound;
-    UINT border = BDR_SUNKENOUTER;
+    UINT border;
     HTHEME theme = GetWindowTheme (infoPtr->Self);
     int themePart = SP_PANE;
     int x = 0;
 
     TRACE("part bound %s\n", wine_dbgstr_rect(&r));
-    if (part->style & SBT_POPOUT)
-        border = BDR_RAISEDOUTER;
-    else if (part->style & SBT_NOBORDERS)
-        border = 0;
 
     if (theme)
     {
@@ -163,7 +159,15 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART
         DrawThemeBackground(theme, hdc, themePart, 0, &r, NULL);
     }
     else
+    {
+        if (part->style & SBT_POPOUT)
+            border = BDR_RAISEDOUTER;
+        else if (part->style & SBT_NOBORDERS)
+            border = 0;
+        else
+            border = BDR_SUNKENOUTER;
         DrawEdge(hdc, &r, border, BF_RECT|BF_ADJUST);
+    }
 
     if (part->hIcon) {
         INT cy = r.bottom - r.top;