solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix initial width of wxTextCtrl in wxOSX

Browse source 
In the process of fixing #22374 by using native best sizes, empty fields
were getting a small, but positive best width, this broke the trigger
for using default widths for empty fields, so fix this by checking that
the width is big enough and not just zero in DoGetSizeFromTextSize().

See #23295.

Closes #23250.
This commit is contained in:
Stefan Csomor 2023-02-25 09:49:34 +01:00 • committed by Vadim Zeitlin
parent e49b791ca9
commit fa23d607e9
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/osx/textctrl_osx.cpp
View file

@ -200,6 +200,7 @@ wxSize wxTextCtrl::DoGetBestSize() const
wxSize wxTextCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const
{
static const int TEXTCTRL_BORDER_SIZE = 5;
static const int TEXTCTRL_MAX_EMPTY_WIDTH = 5;
// Compute the default height if not specified.
int hText = ylen;
@ -237,11 +238,13 @@ wxSize wxTextCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const
// Keep using the same default 100px width as was used previously in the
// special case of having invalid width.
wxSize size(xlen > 0 ? xlen : 100, hText);
// since this method is now called with native field widths, an empty field still
// has small positive xlen, therefore don't compare just with > 0 anymore
wxSize size(xlen > TEXTCTRL_MAX_EMPTY_WIDTH ? xlen : 100, hText);
// Use extra margin size which works under macOS 10.15: note that we don't
// need the vertical margin when using the automatically determined hText.
if ( xlen > 0 )
if ( xlen > TEXTCTRL_MAX_EMPTY_WIDTH )
size.x += 4;
if ( ylen > 0 )
size.y += 2;