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

handle correctly never/always shown scrollbars in GetClientSize()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-12-24 23:46:13 +00:00
parent 1ddb6d2857
commit fcdd533591
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/gtk/window.cpp
View File

@ -2584,17 +2584,43 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
int w = m_width; int w = m_width;
int h = m_height; int h = m_height;
if (m_wxwindow) if ( m_wxwindow )
{ {
// if window is scrollable, account for scrollbars // if window is scrollable, account for scrollbars
for (int i = 0; i < 2 && m_scrollBar[i]; i++) if ( GTK_IS_SCROLLED_WINDOW(m_widget) )
{ {
GtkRequisition req; GtkPolicyType policy[ScrollDir_Max];
GtkAdjustment* adj = gtk_range_get_adjustment(m_scrollBar[i]); gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(m_widget),
// if scrollbar enabled &policy[ScrollDir_Horz],
if (adj->upper > adj->page_size) &policy[ScrollDir_Vert]);
for ( int i = 0; i < ScrollDir_Max; i++ )
{ {
gtk_widget_size_request(GTK_WIDGET(m_scrollBar[i]), &req); // don't account for the scrollbars we don't have
GtkRange * const range = m_scrollBar[i];
if ( !range )
continue;
// nor for the ones we have but don't current show
switch ( policy[i] )
{
case GTK_POLICY_NEVER:
// never shown so doesn't take any place
continue;
case GTK_POLICY_ALWAYS:
// no checks necessary
break;
case GTK_POLICY_AUTOMATIC:
// may be shown or not, check
GtkAdjustment *adj = gtk_range_get_adjustment(range);
if ( adj->upper <= adj->page_size )
continue;
}
GtkRequisition req;
gtk_widget_size_request(GTK_WIDGET(range), &req);
if (i == ScrollDir_Horz) if (i == ScrollDir_Horz)
h -= req.height; h -= req.height;
else else