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

Trying to get default button placement and size right.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2005-03-04 19:14:24 +00:00
parent b737ad10de
commit 863e0817fe
2 changed files with 74 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/gtk/window.cpp
View File

@@ -3102,22 +3102,49 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
if ((maxWidth != -1) && (m_width > maxWidth)) m_width = maxWidth; if ((maxWidth != -1) && (m_width > maxWidth)) m_width = maxWidth;
if ((maxHeight != -1) && (m_height > maxHeight)) m_height = maxHeight; if ((maxHeight != -1) && (m_height > maxHeight)) m_height = maxHeight;
int border = 0; int left_border = 0;
int right_border = 0;
int top_border = 0;
int bottom_border = 0; int bottom_border = 0;
#ifndef __WXGTK20__ /* the default button has a border around it */
if (GTK_WIDGET_CAN_DEFAULT(m_widget)) if (GTK_WIDGET_CAN_DEFAULT(m_widget))
{ {
/* the default button has a border around it */ #ifdef __WXGTK20__
border = 6; #if 0
bottom_border = 5; GtkBorder *default_border;
} gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
if (default_border)
{
left_border += default_border->left;
right_border += default_border->right;
top_border += default_border->top;
bottom_border += default_border->bottom;
g_free( default_border );
}
#endif #endif
GtkBorder *default_outside_border;
{
gtk_widget_style_get( m_widget, "default_outside_border", &default_outside_border, NULL );
left_border += default_outside_border->left;
right_border += default_outside_border->right;
top_border += default_outside_border->top;
bottom_border += default_outside_border->bottom;
g_free( default_outside_border );
}
#else
left_border = 6;
right_border = 6;
top_border = 6;
bottom_border = 5;
#endif
}
DoMoveWindow( m_x-border, DoMoveWindow( m_x-top_border,
m_y-border, m_y-left_border,
m_width+2*border, m_width+left_border+right_border,
m_height+border+bottom_border ); m_height+top_border+bottom_border );
} }
if (m_hasScrolling) if (m_hasScrolling)

47
src/gtk1/window.cpp
View File

@@ -3102,22 +3102,49 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
if ((maxWidth != -1) && (m_width > maxWidth)) m_width = maxWidth; if ((maxWidth != -1) && (m_width > maxWidth)) m_width = maxWidth;
if ((maxHeight != -1) && (m_height > maxHeight)) m_height = maxHeight; if ((maxHeight != -1) && (m_height > maxHeight)) m_height = maxHeight;
int border = 0; int left_border = 0;
int right_border = 0;
int top_border = 0;
int bottom_border = 0; int bottom_border = 0;
#ifndef __WXGTK20__ /* the default button has a border around it */
if (GTK_WIDGET_CAN_DEFAULT(m_widget)) if (GTK_WIDGET_CAN_DEFAULT(m_widget))
{ {
/* the default button has a border around it */ #ifdef __WXGTK20__
border = 6; #if 0
bottom_border = 5; GtkBorder *default_border;
} gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
if (default_border)
{
left_border += default_border->left;
right_border += default_border->right;
top_border += default_border->top;
bottom_border += default_border->bottom;
g_free( default_border );
}
#endif #endif
GtkBorder *default_outside_border;
{
gtk_widget_style_get( m_widget, "default_outside_border", &default_outside_border, NULL );
left_border += default_outside_border->left;
right_border += default_outside_border->right;
top_border += default_outside_border->top;
bottom_border += default_outside_border->bottom;
g_free( default_outside_border );
}
#else
left_border = 6;
right_border = 6;
top_border = 6;
bottom_border = 5;
#endif
}
DoMoveWindow( m_x-border, DoMoveWindow( m_x-top_border,
m_y-border, m_y-left_border,
m_width+2*border, m_width+left_border+right_border,
m_height+border+bottom_border ); m_height+top_border+bottom_border );
} }
if (m_hasScrolling) if (m_hasScrolling)