wine-devel October 2021

81 participants
772 discussions

[PATCH 1/5] comctl32/button: Do not restore push button font after themed painting.

by Zhiyi Zhang

Fix button tests failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index d3dcc67b169..7dfc1720508 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2656,13 +2656,13 @@ cleanup: static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { RECT bgRect, textRect; - HFONT font = infoPtr->font; - HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; WCHAR *text; + if (infoPtr->font) SelectObject(hDC, infoPtr->font); + GetClientRect(infoPtr->hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); init_custom_draw(&nmcd, infoPtr, hDC, &bgRect); @@ -2672,7 +2672,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send erase notifications */ cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); @@ -2687,7 +2687,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send paint notifications */ nmcd.dwDrawStage = CDDS_PREPAINT; cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (!(cdrf & CDRF_DOERASE) && (text = get_button_text(infoPtr))) { @@ -2700,7 +2700,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in nmcd.dwDrawStage = CDDS_POSTPAINT; SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); } - if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; + if (cdrf & CDRF_SKIPPOSTPAINT) return; if (focused) { @@ -2716,9 +2716,6 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in DrawFocusRect( hDC, &focusRect ); } - -cleanup: - if (hPrevFont) SelectObject(hDC, hPrevFont); } static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) -- 2.30.2

2 years, 7 months

[PATCH] light.msstyles: Add scrollbar width and height.

by Zhiyi Zhang

Fix a bug that scrollbar width and height don't change when activating Light theme. For example, when theming is inactive, change scrollbar width from the default 16 pixels to 32 pixels, then activate Light theme. Then scrollbar width should be changed to the theme specified scrollbar width. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 76adf8f8398..cf9271cb612 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -144,7 +144,10 @@ BLUE_INI TEXTFILE "EdgeFillColor = 255 255 255\r\n" "\r\n[SysMetrics]\r\n" -"; System colors\r\n" +"ScrollbarWidth = 16\r\n" +"ScrollbarHeight = 16\r\n" + +"\r\n; System colors\r\n" "Scrollbar = 255 255 255\r\n" "Background = 37 111 149\r\n" "ActiveCaption = 50 150 250\r\n" -- 2.30.2

2 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel October 2021