Zhiyi Zhang : comctl32/rebar: Do not adjust non-client size when themed.
Alexandre Julliard
julliard at winehq.org
Wed Oct 6 15:51:36 CDT 2021
Module: wine
Branch: master
Commit: a9165162dd6184840650711c13c0ddf06b520bfb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9165162dd6184840650711c13c0ddf06b520bfb
Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date: Wed Oct 6 15:48:00 2021 +0800
comctl32/rebar: Do not adjust non-client size when themed.
Fix rebar test failures when theming is on.
Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/comctl32/rebar.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index af35008b692..84390bd0b52 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -3207,19 +3207,13 @@ REBAR_MouseMove (REBAR_INFO *infoPtr, LPARAM lParam)
static inline LRESULT
REBAR_NCCalcSize (const REBAR_INFO *infoPtr, RECT *rect)
{
- HTHEME theme;
-
if (infoPtr->dwStyle & WS_BORDER) {
rect->left = min(rect->left + GetSystemMetrics(SM_CXEDGE), rect->right);
rect->right = max(rect->right - GetSystemMetrics(SM_CXEDGE), rect->left);
rect->top = min(rect->top + GetSystemMetrics(SM_CYEDGE), rect->bottom);
rect->bottom = max(rect->bottom - GetSystemMetrics(SM_CYEDGE), rect->top);
}
- else if ((theme = GetWindowTheme (infoPtr->hwndSelf)))
- {
- /* FIXME: should use GetThemeInt */
- rect->top = min(rect->top + 1, rect->bottom);
- }
+
TRACE("new client=(%s)\n", wine_dbgstr_rect(rect));
return 0;
}
More information about the wine-cvs
mailing list