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

small fix to last commit, only disable updating decor size if necessary

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-08-27 07:08:12 +00:00
parent d2c5fe6e6e
commit 40fd70f109
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/toplevel.cpp
View File

@@ -790,10 +790,10 @@ bool wxTopLevelWindowGTK::Show( bool show )
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
bool deferShow = show && !m_isShown && m_deferShow && m_deferShowAllowed;
bool deferShow = show && !m_isShown && m_deferShow;
if (deferShow)
{
deferShow = !GTK_WIDGET_REALIZED(m_widget);
deferShow = m_deferShowAllowed && !GTK_WIDGET_REALIZED(m_widget);
if (deferShow)
{
deferShow = g_signal_handler_find(m_widget,
@@ -807,19 +807,21 @@ bool wxTopLevelWindowGTK::Show( bool show )
screen = gtk_widget_get_screen(m_widget);
GdkAtom atom = gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false);
deferShow = gdk_x11_screen_supports_net_wm_hint(screen, atom) != 0;
// If _NET_REQUEST_FRAME_EXTENTS not supported, don't allow changes
// to m_decorSize, it breaks saving/restoring window size with
// GetSize()/SetSize() because it makes window bigger between each
// restore and save.
m_updateDecorSize = deferShow;
}
if (deferShow)
{
// Fluxbox support for _NET_REQUEST_FRAME_EXTENTS is broken
const char* name = gdk_x11_screen_get_window_manager_name(screen);
deferShow = strcmp(name, "Fluxbox") != 0;
m_updateDecorSize = deferShow;
}
m_deferShow = deferShow;
// If not deferring, don't allow changes to m_decorSize, it breaks
// saving/restoring window size with GetSize()/SetSize() because it
// makes window bigger between each restore and save.
m_updateDecorSize = !deferShow;
}
if (deferShow)
{