Correct slider width when labels are used.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
73a7e9399f
commit
fdc2232aba
@ -404,7 +404,6 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
w = w - xborder ;
|
|
||||||
if ( m_macMinimumStatic )
|
if ( m_macMinimumStatic )
|
||||||
m_macMinimumStatic->Move(GetPosition().x + 0, GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
|
m_macMinimumStatic->Move(GetPosition().x + 0, GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
|
||||||
if ( m_macMaximumStatic )
|
if ( m_macMaximumStatic )
|
||||||
@ -412,6 +411,7 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
|
|||||||
GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
|
GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT);
|
||||||
if ( m_macValueStatic )
|
if ( m_macValueStatic )
|
||||||
m_macValueStatic->Move(GetPosition().x + w, GetPosition().y + 0);
|
m_macValueStatic->Move(GetPosition().x + w, GetPosition().y + 0);
|
||||||
|
w = w - xborder ;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//If the control has labels, we still need to call this again because
|
//If the control has labels, we still need to call this again because
|
||||||
|
Loading…
Reference in New Issue
Block a user