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

Fixed width of scrollbars in wxUniv.

Browse Source 
The AdjustSize renderer function for wxUniv's GTK and MSW theme adjusted the size of a scrollbar while it already had the correct size, resulting in scrollbars being twice as wide. Fixed by not adjusting the size of a scrollbar anymore in AdjustSize.

Closes #11660.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2011-08-25 23:13:00 +00:00
parent f4308cf55f
commit 82e1729555
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/univ/themes/gtk.cpp
View File

@@ -2267,12 +2267,13 @@ void wxGTKRenderer::AdjustSize(wxSize *size, const wxWindow *window)
#if wxUSE_SCROLLBAR
if ( wxDynamicCast(window, wxScrollBar) )
{
// we only set the width of vert scrollbars and height of the
// horizontal ones
if ( window->GetWindowStyle() & wxSB_HORIZONTAL )
size->y = m_sizeScrollbarArrow.x;
else
size->x = m_sizeScrollbarArrow.x;
/*
Don't adjust the size for a scrollbar as its DoGetBestClientSize
already has the correct size set. Any size changes here would get
added to the best size, making the scrollbar larger.
Also skip border width adjustments, they don't make sense for us.
*/
return;
}
else
#endif // wxUSE_SCROLLBAR

14
src/univ/themes/win32.cpp
View File

@@ -3142,14 +3142,12 @@ void wxWin32Renderer::AdjustSize(wxSize *size, const wxWindow *window)
#if wxUSE_SCROLLBAR
if ( wxDynamicCast(window, wxScrollBar) )
{
// we only set the width of vert scrollbars and height of the
// horizontal ones
if ( window->GetWindowStyle() & wxSB_HORIZONTAL )
size->y = m_sizeScrollbarArrow.y;
else
size->x = m_sizeScrollbarArrow.x;
// skip border width adjustments, they don't make sense for us
/*
Don't adjust the size for a scrollbar as its DoGetBestClientSize
already has the correct size set. Any size changes here would get
added to the best size, making the scrollbar larger.
Also skip border width adjustments, they don't make sense for us.
*/
return;
}
#endif // wxUSE_SCROLLBAR