From 9c62f7e42bc4ba0f87d23dd59eb4d6091a6e0059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= Date: Wed, 3 Apr 2019 20:06:32 +0300 Subject: [PATCH] comctl32/button: Implement BCM_GETIDEALSIZE for split buttons. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gabriel Ivăncescu Signed-off-by: Nikolay Sivov Signed-off-by: Alexandre Julliard --- dlls/comctl32/button.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1f29fb207aa..e974f86b061 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -197,6 +197,7 @@ typedef BOOL (*pfGetIdealSize)(BUTTON_INFO *infoPtr, SIZE *size); static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static BOOL GB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); +static BOOL SB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { PB_GetIdealSize, /* BS_PUSHBUTTON */ @@ -211,9 +212,9 @@ static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { CB_GetIdealSize, /* BS_AUTORADIOBUTTON */ GB_GetIdealSize, /* BS_PUSHBOX */ GB_GetIdealSize, /* BS_OWNERDRAW */ + SB_GetIdealSize, /* BS_SPLITBUTTON */ + SB_GetIdealSize, /* BS_DEFSPLITBUTTON */ /* GetIdealSize() for following types are unimplemented, use BS_PUSHBUTTON's for now */ - PB_GetIdealSize, /* BS_SPLITBUTTON */ - PB_GetIdealSize, /* BS_DEFSPLITBUTTON */ PB_GetIdealSize, /* BS_COMMANDLINK */ PB_GetIdealSize /* BS_DEFCOMMANDLINK */ }; @@ -1347,6 +1348,25 @@ static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) return TRUE; } +static BOOL SB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) +{ + LONG extra_width = infoPtr->glyph_size.cx * 2 + GetSystemMetrics(SM_CXEDGE); + SIZE label_size; + + if (SendMessageW(infoPtr->hwnd, WM_GETTEXTLENGTH, 0, 0) == 0) + { + BUTTON_GetClientRectSize(infoPtr, size); + size->cx = max(size->cx, extra_width); + } + else + { + BUTTON_GetLabelIdealSize(infoPtr, size->cx, &label_size); + size->cx = label_size.cx + ((size->cx == 0) ? extra_width : 0); + size->cy = label_size.cy; + } + return TRUE; +} + /********************************************************************** * BUTTON_CalcLayoutRects *