cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxOSX sizing of borderless wxBitmapButton

Browse Source 
Don't apply the workaround required for NSRoundedBezelStyle and
NSTexturedRoundedBezelStyle, i.e. enlarging too small buttons, if these
bezel styles are not used. In particular, avoid enlarging buttons with
wxBORDER_NONE or wxBORDER_SIMPLE.

Follow-up to 0941b25.
This commit is contained in:
Václav Slavík 2021-02-21 09:58:27 +01:00
parent 7eeab1bb7e
commit 26826c9bea
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/osx/bmpbuttn_osx.cpp
View File

@ -66,9 +66,18 @@ wxSize wxBitmapButton::DoGetBestSize() const
// account for it here to prevent part of the image from being cut off. // account for it here to prevent part of the image from being cut off.
// //
// Note that the magic 20px comes from SetBezelStyleFromBorderFlags() // Note that the magic 20px comes from SetBezelStyleFromBorderFlags()
// defined in src/osx/cocoa/button.mm. // defined in src/osx/cocoa/button.mm and so do the style checks.
if ( bitmapSize.y < 20 ) switch ( GetWindowStyle() & wxBORDER_MASK )
best += wxSize(4,0); {
case wxBORDER_NONE:
case wxBORDER_SIMPLE:
break;
default:
if ( bitmapSize.y < 20 )
best += wxSize(4,0);
break;
}
} }
return best; return best;