AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix excessive height of wxSlider with labels but no ticks in wxMSW.

Browse Source 
We shouldn't add the label height to the control best height as the labels are
positioned at the same vertical level as the main part of the control.

See #16604.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2014-10-09 15:37:45 +00:00
parent 9622023abc
commit 3a4cea5b20
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/slider.cpp
View File

@ -546,10 +546,8 @@ wxSize wxSlider::DoGetBestSize() const
{ {
int labelSize = GetLabelsSize(); int labelSize = GetLabelsSize();
// Min/max labels are compensated by the ticks so we don't need // Min/max labels are compensated by the thumb so we don't need
// extra space for them if we're also showing ticks. // extra space for them
if ( HasFlag(wxSL_MIN_MAX_LABELS) && !HasFlag(wxSL_TICKS) )
size.y += labelSize;
// The value label is always on top of the control and so does need // The value label is always on top of the control and so does need
// extra space in any case. // extra space in any case.