[PATCH 0/6] MR9422: comctl32/rebar: Add a helper to draw the gripper.
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/rebar.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 79c217c67a1..70d621311b4 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -556,6 +556,25 @@ REBAR_Notify_NMREBAR (const REBAR_INFO *infoPtr, UINT uBand, UINT code) return REBAR_Notify ((NMHDR *)¬ify_rebar, infoPtr, code); } +static void +REBAR_DrawGripper (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) +{ + HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); + + if (theme) + { + RECT rcGripper = lpBand->rcGripper; + int partId = (infoPtr->dwStyle & CCS_VERT) ? RP_GRIPPERVERT : RP_GRIPPER; + GetThemeBackgroundExtent (theme, hdc, partId, 0, &rcGripper, &rcGripper); + OffsetRect (&rcGripper, lpBand->rcGripper.left - rcGripper.left, + lpBand->rcGripper.top - rcGripper.top); + DrawThemeBackground (theme, hdc, partId, 0, &rcGripper, NULL); + return; + } + + DrawEdge (hdc, &lpBand->rcGripper, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE); +} + static VOID REBAR_DrawBand (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) { @@ -591,19 +610,7 @@ REBAR_DrawBand (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) /* draw gripper */ if (lpBand->fDraw & DRAW_GRIPPER) - { - if (theme) - { - RECT rcGripper = lpBand->rcGripper; - int partId = (infoPtr->dwStyle & CCS_VERT) ? RP_GRIPPERVERT : RP_GRIPPER; - GetThemeBackgroundExtent (theme, hdc, partId, 0, &rcGripper, &rcGripper); - OffsetRect (&rcGripper, lpBand->rcGripper.left - rcGripper.left, - lpBand->rcGripper.top - rcGripper.top); - DrawThemeBackground (theme, hdc, partId, 0, &rcGripper, NULL); - } - else - DrawEdge (hdc, &lpBand->rcGripper, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE); - } + REBAR_DrawGripper (hdc, infoPtr, lpBand); /* draw caption image */ if (lpBand->fDraw & DRAW_IMAGE) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9422
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/rebar.c | 67 ++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 70d621311b4..102ab23a231 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -481,7 +481,7 @@ static void update_min_band_height(const REBAR_INFO *infoPtr, REBAR_BAND *lpBand } static void -REBAR_DrawChevron (HDC hdc, INT left, INT top, INT colorRef) +REBAR_DrawFlatChevron (HDC hdc, INT left, INT top, INT colorRef) { INT x, y; HPEN hPen, hOldPen; @@ -575,13 +575,47 @@ REBAR_DrawGripper (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) DrawEdge (hdc, &lpBand->rcGripper, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE); } +static void +REBAR_DrawChevron (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) +{ + HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); + + if (theme) + { + int stateId; + + if (lpBand->fDraw & DRAW_CHEVRONPUSHED) + stateId = CHEVS_PRESSED; + else if (lpBand->fDraw & DRAW_CHEVRONHOT) + stateId = CHEVS_HOT; + else + stateId = CHEVS_NORMAL; + DrawThemeBackground (theme, hdc, RP_CHEVRON, stateId, &lpBand->rcChevron, NULL); + return; + } + + if (lpBand->fDraw & DRAW_CHEVRONPUSHED) + { + DrawEdge (hdc, &lpBand->rcChevron, BDR_SUNKENOUTER, BF_RECT | BF_MIDDLE); + REBAR_DrawFlatChevron (hdc, lpBand->rcChevron.left + 1, lpBand->rcChevron.top + 11, COLOR_WINDOWFRAME); + } + else if (lpBand->fDraw & DRAW_CHEVRONHOT) + { + DrawEdge (hdc, &lpBand->rcChevron, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE); + REBAR_DrawFlatChevron (hdc, lpBand->rcChevron.left, lpBand->rcChevron.top + 10, COLOR_WINDOWFRAME); + } + else + { + REBAR_DrawFlatChevron (hdc, lpBand->rcChevron.left, lpBand->rcChevron.top + 10, COLOR_WINDOWFRAME); + } +} + static VOID REBAR_DrawBand (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) { HFONT hOldFont = 0; INT oldBkMode = 0; NMCUSTOMDRAW nmcd; - HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); RECT rcBand; translate_rect(infoPtr, &rcBand, &lpBand->rcBand); @@ -646,34 +680,7 @@ REBAR_DrawBand (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) } if (!IsRectEmpty(&lpBand->rcChevron)) - { - if (theme) - { - int stateId; - if (lpBand->fDraw & DRAW_CHEVRONPUSHED) - stateId = CHEVS_PRESSED; - else if (lpBand->fDraw & DRAW_CHEVRONHOT) - stateId = CHEVS_HOT; - else - stateId = CHEVS_NORMAL; - DrawThemeBackground (theme, hdc, RP_CHEVRON, stateId, &lpBand->rcChevron, NULL); - } - else - { - if (lpBand->fDraw & DRAW_CHEVRONPUSHED) - { - DrawEdge(hdc, &lpBand->rcChevron, BDR_SUNKENOUTER, BF_RECT | BF_MIDDLE); - REBAR_DrawChevron(hdc, lpBand->rcChevron.left+1, lpBand->rcChevron.top + 11, COLOR_WINDOWFRAME); - } - else if (lpBand->fDraw & DRAW_CHEVRONHOT) - { - DrawEdge(hdc, &lpBand->rcChevron, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE); - REBAR_DrawChevron(hdc, lpBand->rcChevron.left, lpBand->rcChevron.top + 10, COLOR_WINDOWFRAME); - } - else - REBAR_DrawChevron(hdc, lpBand->rcChevron.left, lpBand->rcChevron.top + 10, COLOR_WINDOWFRAME); - } - } + REBAR_DrawChevron (hdc, infoPtr, lpBand); if (lpBand->uCDret == (CDRF_NOTIFYPOSTPAINT | CDRF_NOTIFYITEMDRAW)) { nmcd.dwDrawStage = CDDS_ITEMPOSTPAINT; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9422
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/rebar.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 102ab23a231..3d32006cff0 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -610,6 +610,20 @@ REBAR_DrawChevron (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) } } +static void +REBAR_DrawBandSeparator (HWND hwnd, HDC hdc, RECT *rect, UINT flags) +{ + HTHEME theme = GetWindowTheme (hwnd); + + if (theme) + { + DrawThemeEdge (theme, hdc, RP_BAND, 0, rect, EDGE_ETCHED, flags, NULL); + return; + } + + DrawEdge (hdc, rect, EDGE_ETCHED, flags); +} + static VOID REBAR_DrawBand (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) { @@ -1870,18 +1884,12 @@ static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) if (infoPtr->dwStyle & CCS_VERT) { rcRowSep.right += SEP_WIDTH_SIZE; rcRowSep.bottom = infoPtr->calcSize.cx; - if (theme) - DrawThemeEdge (theme, hdc, RP_BAND, 0, &rcRowSep, EDGE_ETCHED, BF_RIGHT, NULL); - else - DrawEdge (hdc, &rcRowSep, EDGE_ETCHED, BF_RIGHT); + REBAR_DrawBandSeparator (infoPtr->hwndSelf, hdc, &rcRowSep, BF_RIGHT); } else { rcRowSep.bottom += SEP_WIDTH_SIZE; rcRowSep.right = infoPtr->calcSize.cx; - if (theme) - DrawThemeEdge (theme, hdc, RP_BAND, 0, &rcRowSep, EDGE_ETCHED, BF_BOTTOM, NULL); - else - DrawEdge (hdc, &rcRowSep, EDGE_ETCHED, BF_BOTTOM); + REBAR_DrawBandSeparator (infoPtr->hwndSelf, hdc, &rcRowSep, BF_BOTTOM); } TRACE ("drawing band separator bottom (%s)\n", wine_dbgstr_rect(&rcRowSep)); @@ -1895,18 +1903,12 @@ static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) if (infoPtr->dwStyle & CCS_VERT) { rcSep.bottom = rcSep.top; rcSep.top -= SEP_WIDTH_SIZE; - if (theme) - DrawThemeEdge (theme, hdc, RP_BAND, 0, &rcSep, EDGE_ETCHED, BF_BOTTOM, NULL); - else - DrawEdge (hdc, &rcSep, EDGE_ETCHED, BF_BOTTOM); + REBAR_DrawBandSeparator (infoPtr->hwndSelf, hdc, &rcSep, BF_BOTTOM); } else { rcSep.right = rcSep.left; rcSep.left -= SEP_WIDTH_SIZE; - if (theme) - DrawThemeEdge (theme, hdc, RP_BAND, 0, &rcSep, EDGE_ETCHED, BF_RIGHT, NULL); - else - DrawEdge (hdc, &rcSep, EDGE_ETCHED, BF_RIGHT); + REBAR_DrawBandSeparator (infoPtr->hwndSelf, hdc, &rcSep, BF_RIGHT); } TRACE("drawing band separator right (%s)\n", wine_dbgstr_rect(&rcSep)); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9422
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/rebar.c | 80 ++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 3d32006cff0..b97dc50bed1 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1853,6 +1853,46 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan return uChanged; } +static void REBAR_DrawBandBackground (const REBAR_INFO *infoPtr, REBAR_BAND *lpBand, HDC hdc, + const RECT *client_rect, const RECT *band_rect) +{ + COLORREF old_color, new_color; + HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); + + if (theme) + { + /* When themed, the background color is ignored (but not a background bitmap) */ + DrawThemeBackground (theme, hdc, 0, 0, client_rect, band_rect); + return; + } + + if (lpBand->clrBack != CLR_NONE) + { + new_color = (lpBand->clrBack == CLR_DEFAULT) ? infoPtr->clrBtnFace : lpBand->clrBack; +#if GLATESTING + /* testing only - make background green to see it */ + new_color = RGB(0, 128, 0); +#endif + } + else + { + /* In the absence of documentation for Rebar vs. CLR_NONE, we will use the default BtnFace + * color. Note documentation exists for Listview and Imagelist. */ + new_color = infoPtr->clrBtnFace; +#if GLATESTING + /* testing only - make background green to see it */ + new_color = RGB(0, 128, 0); +#endif + } + old_color = SetBkColor(hdc, new_color); + TRACE("%s background color %#lx, band %s\n", + (lpBand->clrBack == CLR_NONE) ? "none" : ((lpBand->clrBack == CLR_DEFAULT) ? "dft" : ""), + GetBkColor (hdc), wine_dbgstr_rect (band_rect)); + ExtTextOutW (hdc, 0, 0, ETO_OPAQUE, band_rect, NULL, 0, 0); + if (lpBand->clrBack != CLR_NONE) + SetBkColor (hdc, old_color); +} + static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) /* Function: This erases the background rectangle by drawing */ /* each band with its background color (or the default) and */ @@ -1863,8 +1903,6 @@ static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) UINT i; INT oldrow; RECT cr; - COLORREF old = CLR_NONE, new; - HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); GetClientRect (infoPtr->hwndSelf, &cr); @@ -1915,43 +1953,7 @@ static LRESULT REBAR_EraseBkGnd (const REBAR_INFO *infoPtr, HDC hdc) } /* draw the actual background */ - if (lpBand->clrBack != CLR_NONE) { - new = (lpBand->clrBack == CLR_DEFAULT) ? infoPtr->clrBtnFace : - lpBand->clrBack; -#if GLATESTING - /* testing only - make background green to see it */ - new = RGB(0,128,0); -#endif - } - else { - /* In the absence of documentation for Rebar vs. CLR_NONE, - * we will use the default BtnFace color. Note documentation - * exists for Listview and Imagelist. - */ - new = infoPtr->clrBtnFace; -#if GLATESTING - /* testing only - make background green to see it */ - new = RGB(0,128,0); -#endif - } - - if (theme) - { - /* When themed, the background color is ignored (but not a - * background bitmap */ - DrawThemeBackground (theme, hdc, 0, 0, &cr, &rcBand); - } - else - { - old = SetBkColor (hdc, new); - TRACE("%s background color %#lx, band %s\n", - (lpBand->clrBack == CLR_NONE) ? "none" : - ((lpBand->clrBack == CLR_DEFAULT) ? "dft" : ""), - GetBkColor(hdc), wine_dbgstr_rect(&rcBand)); - ExtTextOutW (hdc, 0, 0, ETO_OPAQUE, &rcBand, NULL, 0, 0); - if (lpBand->clrBack != CLR_NONE) - SetBkColor (hdc, old); - } + REBAR_DrawBandBackground (infoPtr, lpBand, hdc, &cr, &rcBand); } return TRUE; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9422
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/rebar.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index b97dc50bed1..e3795a37f37 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3336,34 +3336,31 @@ REBAR_NCPaint (const REBAR_INFO *infoPtr) { RECT rcWindow; HDC hdc; - HTHEME theme; if (infoPtr->dwStyle & WS_MINIMIZE) return 0; /* Nothing to do */ - if (infoPtr->dwStyle & WS_BORDER) { + if (!(infoPtr->dwStyle & WS_BORDER) && !COMCTL32_IsThemed (infoPtr->hwndSelf)) + return 0; - /* adjust rectangle and draw the necessary edge */ - if (!(hdc = GetDCEx( infoPtr->hwndSelf, 0, DCX_USESTYLE | DCX_WINDOW ))) - return 0; - GetWindowRect (infoPtr->hwndSelf, &rcWindow); - OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top); - TRACE("rect (%s)\n", wine_dbgstr_rect(&rcWindow)); - DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_RECT); - ReleaseDC( infoPtr->hwndSelf, hdc ); - } - else if ((theme = GetWindowTheme (infoPtr->hwndSelf))) + /* adjust rectangle and draw the necessary edge */ + if (!(hdc = GetDCEx (infoPtr->hwndSelf, 0, DCX_USESTYLE | DCX_WINDOW))) + return 0; + + GetWindowRect (infoPtr->hwndSelf, &rcWindow); + OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top); + TRACE("rect (%s)\n", wine_dbgstr_rect(&rcWindow)); + + if (!(infoPtr->dwStyle & WS_BORDER)) { - /* adjust rectangle and draw the necessary edge */ - if (!(hdc = GetDCEx( infoPtr->hwndSelf, 0, DCX_USESTYLE | DCX_WINDOW ))) - return 0; - GetWindowRect (infoPtr->hwndSelf, &rcWindow); - OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top); - TRACE("rect (%s)\n", wine_dbgstr_rect(&rcWindow)); + HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); DrawThemeEdge (theme, hdc, 0, 0, &rcWindow, BDR_RAISEDINNER, BF_TOP, NULL); - ReleaseDC( infoPtr->hwndSelf, hdc ); + ReleaseDC (infoPtr->hwndSelf, hdc); + return 0; } + DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_RECT); + ReleaseDC (infoPtr->hwndSelf, hdc); return 0; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9422
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/rebar.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index e3795a37f37..70dc66af816 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -300,8 +300,6 @@ static const char * const band_maskname[] = { "RBBIM_CHEVRONSTATE", /* 0x00002000 */ NULL }; -static const WCHAR themeClass[] = L"Rebar"; - static CHAR * REBAR_FmtStyle(char *buffer, UINT style) { @@ -559,6 +557,7 @@ REBAR_Notify_NMREBAR (const REBAR_INFO *infoPtr, UINT uBand, UINT code) static void REBAR_DrawGripper (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) { +#if __WINE_COMCTL32_VERSION == 6 HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); if (theme) @@ -571,6 +570,7 @@ REBAR_DrawGripper (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) DrawThemeBackground (theme, hdc, partId, 0, &rcGripper, NULL); return; } +#endif DrawEdge (hdc, &lpBand->rcGripper, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE); } @@ -578,6 +578,7 @@ REBAR_DrawGripper (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) static void REBAR_DrawChevron (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) { +#if __WINE_COMCTL32_VERSION == 6 HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); if (theme) @@ -593,6 +594,7 @@ REBAR_DrawChevron (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) DrawThemeBackground (theme, hdc, RP_CHEVRON, stateId, &lpBand->rcChevron, NULL); return; } +#endif if (lpBand->fDraw & DRAW_CHEVRONPUSHED) { @@ -613,6 +615,7 @@ REBAR_DrawChevron (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) static void REBAR_DrawBandSeparator (HWND hwnd, HDC hdc, RECT *rect, UINT flags) { +#if __WINE_COMCTL32_VERSION == 6 HTHEME theme = GetWindowTheme (hwnd); if (theme) @@ -620,6 +623,7 @@ REBAR_DrawBandSeparator (HWND hwnd, HDC hdc, RECT *rect, UINT flags) DrawThemeEdge (theme, hdc, RP_BAND, 0, rect, EDGE_ETCHED, flags, NULL); return; } +#endif DrawEdge (hdc, rect, EDGE_ETCHED, flags); } @@ -1857,6 +1861,8 @@ static void REBAR_DrawBandBackground (const REBAR_INFO *infoPtr, REBAR_BAND *lpB const RECT *client_rect, const RECT *band_rect) { COLORREF old_color, new_color; + +#if __WINE_COMCTL32_VERSION == 6 HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); if (theme) @@ -1865,6 +1871,7 @@ static void REBAR_DrawBandBackground (const REBAR_INFO *infoPtr, REBAR_BAND *lpB DrawThemeBackground (theme, hdc, 0, 0, client_rect, band_rect); return; } +#endif if (lpBand->clrBack != CLR_NONE) { @@ -2937,7 +2944,7 @@ REBAR_Create (REBAR_INFO *infoPtr, LPCREATESTRUCTW cs) cs->x, cs->y, cs->cx, cs->cy); } - OpenThemeData(infoPtr->hwndSelf, themeClass); + COMCTL32_OpenThemeForWindow(infoPtr->hwndSelf, L"Rebar"); TRACE("created!\n"); return 0; @@ -2972,8 +2979,8 @@ REBAR_Destroy (REBAR_INFO *infoPtr) DestroyCursor (infoPtr->hcurDrag); if (infoPtr->hDefaultFont) DeleteObject (infoPtr->hDefaultFont); SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); - - CloseThemeData (GetWindowTheme (infoPtr->hwndSelf)); + + COMCTL32_CloseThemeForWindow (infoPtr->hwndSelf); /* free rebar info data */ Free (infoPtr); @@ -3351,6 +3358,7 @@ REBAR_NCPaint (const REBAR_INFO *infoPtr) OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top); TRACE("rect (%s)\n", wine_dbgstr_rect(&rcWindow)); +#if __WINE_COMCTL32_VERSION == 6 if (!(infoPtr->dwStyle & WS_BORDER)) { HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); @@ -3358,6 +3366,7 @@ REBAR_NCPaint (const REBAR_INFO *infoPtr) ReleaseDC (infoPtr->hwndSelf, hdc); return 0; } +#endif DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_RECT); ReleaseDC (infoPtr->hwndSelf, hdc); @@ -3518,14 +3527,6 @@ REBAR_StyleChanged (REBAR_INFO *infoPtr, INT nType, const STYLESTRUCT *lpStyle) return FALSE; } -/* update theme after a WM_THEMECHANGED message */ -static LRESULT theme_changed (REBAR_INFO* infoPtr) -{ - HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); - CloseThemeData (theme); - OpenThemeData(infoPtr->hwndSelf, themeClass); - return 0; -} static LRESULT REBAR_WindowPosChanged (const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) @@ -3739,7 +3740,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return REBAR_StyleChanged (infoPtr, wParam, (LPSTYLESTRUCT)lParam); case WM_THEMECHANGED: - return theme_changed (infoPtr); + return COMCTL32_ThemeChanged (infoPtr->hwndSelf, L"Rebar", FALSE, FALSE); case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9422
This merge request was approved by Nikolay Sivov. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9422
participants (3)
-
Nikolay Sivov (＠nsivov) -
Zhiyi Zhang
-
Zhiyi Zhang (＠zhiyi)