[PATCH] comctl32: ShowWindow should be called in REBAR_CommonSetupBand on visibility change

StartForKillerMC jesussanz2003 at gmail.com
Thu Dec 30 04:51:48 CST 2021


This bug was reported on ReactOS jira: https://jira.reactos.org/browse/CORE-17236

Signed-off-by: StartForKillerMC <jesussanz2003 at gmail.com>
---
 dlls/comctl32/rebar.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 6a065514e60..4934728f23f 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -1705,13 +1705,6 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan
 
     lpBand->fMask |= lprbbi->fMask;
 
-    if( (lprbbi->fMask & RBBIM_STYLE) &&
-        (lpBand->fStyle != lprbbi->fStyle ) )
-    {
-	lpBand->fStyle = lprbbi->fStyle;
-        uChanged |= RBBIM_STYLE;
-    }
-
     if( (lprbbi->fMask & RBBIM_COLORS) &&
        ( ( lpBand->clrFore != lprbbi->clrFore ) ||
          ( lpBand->clrBack != lprbbi->clrBack ) ) )
@@ -1748,6 +1741,15 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan
         uChanged |= RBBIM_CHILD;
     }
 
+    if( (lprbbi->fMask & RBBIM_STYLE) &&
+        (lpBand->fStyle != lprbbi->fStyle ) )
+    {
+    if (lpBand->hwndChild && ((lpBand->fStyle & RBBS_HIDDEN) != (lprbbi->fStyle & RBBS_HIDDEN)))
+            ShowWindow(lpBand->hwndChild, (lprbbi->fStyle & RBBS_HIDDEN) ? SW_HIDE : (SW_SHOWNOACTIVATE | SW_SHOWNORMAL));
+	lpBand->fStyle = lprbbi->fStyle;
+        uChanged |= RBBIM_STYLE;
+    }
+
     if( (lprbbi->fMask & RBBIM_CHILDSIZE) &&
         ( (lpBand->cxMinChild != lprbbi->cxMinChild) ||
           (lpBand->cyMinChild != lprbbi->cyMinChild ) ||
-- 
2.33.0




More information about the wine-devel mailing list