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

Use a symbolic constant for toolbar height adjustment hack value

Browse Source 
No real changes, just avoid hard-coding this 3 as it's going to be used
in another place in the upcoming commit.
This commit is contained in:
Vadim Zeitlin
2019-02-28 23:50:41 +01:00
parent acfd714743
commit b8a5276bc8
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/toolbar.cpp
View File

@@ -97,6 +97,13 @@
// Margin between the control and its label. // Margin between the control and its label.
static const int MARGIN_CONTROL_LABEL = 3; static const int MARGIN_CONTROL_LABEL = 3;
// We make (flat-only) toolbars smaller by this amount than the value that
// would be given to them by TB_AUTOSIZE. This is done for cosmetic reasons and
// also to decrease the vertical space consumed by the toolbar and, finally and
// perhaps most significantly, for compatibility, as people dislike their
// toolbars changing height when updating to a new wxWidgets version.
static const int AUTOSIZE_HEIGHT_ADJUSTMENT = 3;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxWin macros // wxWin macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1719,7 +1726,7 @@ void wxToolBar::UpdateSize()
// at all if this is the right thing to do, but continue doing it now // at all if this is the right thing to do, but continue doing it now
// for compatibility. // for compatibility.
if ( HasFlag(wxTB_FLAT) ) if ( HasFlag(wxTB_FLAT) )
size.y -= 3; size.y -= AUTOSIZE_HEIGHT_ADJUSTMENT;
} }
SetSize(wxRect(pos, size)); SetSize(wxRect(pos, size));