[PATCH 2/6] comctl32/button: Use correct state for default buttons.

Zhiyi Zhang zzhang at codeweavers.com
Thu Nov 11 01:03:51 CST 2021


Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
---
 dlls/comctl32/button.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c
index b612273c0c1..93f6c21bab1 100644
--- a/dlls/comctl32/button.c
+++ b/dlls/comctl32/button.c
@@ -410,7 +410,8 @@ static int get_draw_state(const BUTTON_INFO *infoPtr)
         state = STATE_PRESSED;
     else if (infoPtr->state & BST_HOT)
         state = STATE_HOT;
-    else if (infoPtr->state & BST_FOCUS)
+    else if (infoPtr->state & BST_FOCUS || type == BS_DEFPUSHBUTTON || type == BS_DEFSPLITBUTTON
+             || (type == BS_DEFCOMMANDLINK && !(style & BS_PUSHLIKE)))
         state = STATE_DEFAULTED;
     else
         state = STATE_NORMAL;
-- 
2.32.0




More information about the wine-devel mailing list