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

fix SetSizeHints when wxDefaultSize is given for min or max size

Browse Source 
GTK does unexpected things if both min and max size are not explicitly set

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-06-22 06:41:56 +00:00
parent b5a1cc93f3
commit f94d58dd75
1 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/gtk/toplevel.cpp
View File

@@ -686,13 +686,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
} }
// GTK sometimes chooses very small size if max size hint is not explicitly set // GTK sometimes chooses very small size if max size hint is not explicitly set
int maxWidth = m_maxWidth; DoSetSizeHints(m_minWidth, m_minHeight, m_maxWidth, m_maxHeight, -1, -1);
int maxHeight = m_maxHeight;
if (maxWidth < 0)
maxWidth = INT_MAX;
if (maxHeight < 0)
maxHeight = INT_MAX;
DoSetSizeHints(m_minWidth, m_minHeight, maxWidth, maxHeight, -1, -1);
m_decorSize = GetCachedDecorSize(); m_decorSize = GetCachedDecorSize();
int w, h; int w, h;
@@ -1110,39 +1104,29 @@ void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
const wxSize minSize = GetMinSize(); const wxSize minSize = GetMinSize();
const wxSize maxSize = GetMaxSize(); const wxSize maxSize = GetMaxSize();
GdkGeometry hints; GdkGeometry hints;
int hints_mask = 0; // always set both min and max hints, otherwise GTK will
if (minSize.x > 0 || minSize.y > 0) // make assumptions we don't want about the unset values
{ int hints_mask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE;
hints_mask |= GDK_HINT_MIN_SIZE; hints.min_width = 1;
hints.min_height = 1;
hints.max_width = INT_MAX;
hints.max_height = INT_MAX;
if (minSize.x > m_decorSize.x)
hints.min_width = minSize.x - m_decorSize.x; hints.min_width = minSize.x - m_decorSize.x;
if (hints.min_width < 0) if (minSize.y > m_decorSize.y)
hints.min_width = 0;
hints.min_height = minSize.y - m_decorSize.y; hints.min_height = minSize.y - m_decorSize.y;
if (hints.min_height < 0) if (maxSize.x > m_decorSize.x)
hints.min_height = 0;
}
if (maxSize.x > 0 || maxSize.y > 0)
{
hints_mask |= GDK_HINT_MAX_SIZE;
hints.max_width = maxSize.x - m_decorSize.x; hints.max_width = maxSize.x - m_decorSize.x;
if (hints.max_width < 0) if (maxSize.y > m_decorSize.y)
hints.max_width = INT_MAX;
hints.max_height = maxSize.y - m_decorSize.y; hints.max_height = maxSize.y - m_decorSize.y;
if (hints.max_height < 0)
hints.max_height = INT_MAX;
}
if (incW > 0 || incH > 0) if (incW > 0 || incH > 0)
{ {
hints_mask |= GDK_HINT_RESIZE_INC; hints_mask |= GDK_HINT_RESIZE_INC;
hints.width_inc = incW > 0 ? incW : 1; hints.width_inc = incW > 0 ? incW : 1;
hints.height_inc = incH > 0 ? incH : 1; hints.height_inc = incH > 0 ? incH : 1;
} }
gtk_window_set_geometry_hints(
if (hints_mask) (GtkWindow*)m_widget, NULL, &hints, (GdkWindowHints)hints_mask);
{
gtk_window_set_geometry_hints(
(GtkWindow*)m_widget, NULL, &hints, (GdkWindowHints)hints_mask);
}
} }
void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize) void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)