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

avoid deferred show with Fluxbox, its support for _NET_REQUEST_FRAME_EXTENTS is broken

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

42
src/gtk/toplevel.cpp
View File

@@ -416,14 +416,13 @@ static gboolean property_notify_event(
static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false); static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
if (event->state == GDK_PROPERTY_NEW_VALUE && event->atom == property) if (event->state == GDK_PROPERTY_NEW_VALUE && event->atom == property)
{ {
wxSize decorSize = win->m_decorSize;
int left, right, top, bottom; int left, right, top, bottom;
if (wxGetFrameExtents(event->window, &left, &right, &top, &bottom)) if (wxGetFrameExtents(event->window, &left, &right, &top, &bottom))
{ decorSize.Set(left + right, top + bottom);
const wxSize decorSize =
wxSize(left + right, top + bottom);
win->GTKUpdateDecorSize(decorSize); win->GTKUpdateDecorSize(decorSize);
} }
}
return false; return false;
} }
} }
@@ -794,28 +793,33 @@ bool wxTopLevelWindowGTK::Show( bool show )
bool deferShow = show && !m_isShown && m_deferShow && m_deferShowAllowed; bool deferShow = show && !m_isShown && m_deferShow && m_deferShowAllowed;
if (deferShow) if (deferShow)
{ {
deferShow = false; deferShow = !GTK_WIDGET_REALIZED(m_widget);
if (!GTK_WIDGET_REALIZED(m_widget) && if (deferShow)
g_signal_handler_find(m_widget, {
deferShow = g_signal_handler_find(m_widget,
GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA), GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
g_signal_lookup("property_notify_event", GTK_TYPE_WIDGET), g_signal_lookup("property_notify_event", GTK_TYPE_WIDGET),
0, NULL, NULL, this)) 0, NULL, NULL, this) != 0;
{
if (gdk_x11_screen_supports_net_wm_hint(
gtk_widget_get_screen(m_widget),
gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false)))
{
deferShow = true;
} }
else GdkScreen* screen = NULL;
if (deferShow)
{ {
// Don't allow changes to m_decorSize, it breaks saving/restoring screen = gtk_widget_get_screen(m_widget);
// window size with GetSize()/SetSize() because it makes window GdkAtom atom = gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false);
// bigger between each restore and save. deferShow = gdk_x11_screen_supports_net_wm_hint(screen, atom) != 0;
m_updateDecorSize = false;
} }
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_deferShow = 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) if (deferShow)
{ {