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

Use TEXTCTRL_BORDER_SIZE symbolic constant in wxTextCtrl code

Browse Source 
This is more readable than hardcoded 5.

No real changes.
This commit is contained in:
Vadim Zeitlin
2020-05-28 01:34:59 +02:00
parent a06fb27f21
commit 43c9b9f658
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/osx/textctrl_osx.cpp
View File

@@ -43,6 +43,8 @@
#include "wx/osx/private.h" #include "wx/osx/private.h"
static const int TEXTCTRL_BORDER_SIZE = 5;
wxBEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) wxBEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
EVT_DROP_FILES(wxTextCtrl::OnDropFiles) EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
EVT_CHAR(wxTextCtrl::OnChar) EVT_CHAR(wxTextCtrl::OnChar)
@@ -199,28 +201,31 @@ wxSize wxTextCtrl::DoGetBestSize() const
if ( hText == - 1) if ( hText == - 1)
{ {
// these are the numbers from the HIG:
// we reduce them by the borders first
wText = 100 ; wText = 100 ;
// these are the numbers from the HIG:
switch ( m_windowVariant ) switch ( m_windowVariant )
{ {
case wxWINDOW_VARIANT_NORMAL : case wxWINDOW_VARIANT_NORMAL :
hText = 22 - 5 ; hText = 22;
break ; break ;
case wxWINDOW_VARIANT_SMALL : case wxWINDOW_VARIANT_SMALL :
hText = 19 - 5 ; hText = 19;
break ; break ;
case wxWINDOW_VARIANT_MINI : case wxWINDOW_VARIANT_MINI :
hText = 15 - 5 ; hText = 15;
break ; break ;
default : default :
hText = 22 - 5; hText = 22;
break ; break ;
} }
// the numbers above include the border size, so subtract it before
// possibly adding it back below
hText -= TEXTCTRL_BORDER_SIZE;
} }
// as the above numbers have some free space around the text // as the above numbers have some free space around the text
@@ -229,7 +234,7 @@ wxSize wxTextCtrl::DoGetBestSize() const
hText *= 5 ; hText *= 5 ;
if ( !HasFlag(wxNO_BORDER) ) if ( !HasFlag(wxNO_BORDER) )
hText += 5 ; hText += TEXTCTRL_BORDER_SIZE ;
return wxSize(wText, hText); return wxSize(wText, hText);
} }