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

reorganize deferred show logic a bit, to reset m_deferShow properly and avoid realizing unnecessarily

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-03-17 04:25:10 +00:00
parent 8024723d76
commit aacd4b50d3
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gtk/toplevel.cpp
View File

@@ -758,13 +758,19 @@ bool wxTopLevelWindowGTK::Show( bool show )
{ {
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
const bool wasRealized = GTK_WIDGET_REALIZED(m_widget); bool deferShow = show && m_deferShow;
bool deferShow = if (deferShow)
show && m_deferShow && !wasRealized && {
m_deferShow =
deferShow = !GTK_WIDGET_REALIZED(m_widget) &&
gdk_x11_screen_supports_net_wm_hint(
gtk_widget_get_screen(m_widget),
gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false)) &&
g_signal_handler_find(m_widget, 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);
}
if (deferShow) if (deferShow)
{ {
// Initial show. If WM supports _NET_REQUEST_FRAME_EXTENTS, defer // Initial show. If WM supports _NET_REQUEST_FRAME_EXTENTS, defer
@@ -785,13 +791,6 @@ bool wxTopLevelWindowGTK::Show( bool show )
if (alloc_width == 1) if (alloc_width == 1)
m_widget->allocation.width = 1; m_widget->allocation.width = 1;
m_deferShow =
deferShow = gdk_x11_screen_supports_net_wm_hint(
gdk_drawable_get_screen(m_widget->window),
gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false)) != 0;
}
if (deferShow)
{
// send _NET_REQUEST_FRAME_EXTENTS // send _NET_REQUEST_FRAME_EXTENTS
XClientMessageEvent xevent; XClientMessageEvent xevent;
memset(&xevent, 0, sizeof(xevent)); memset(&xevent, 0, sizeof(xevent));
@@ -811,7 +810,7 @@ bool wxTopLevelWindowGTK::Show( bool show )
return true; return true;
} }
if (show && !wasRealized) if (show && !GTK_WIDGET_REALIZED(m_widget))
{ {
// size_allocate signals occur in reverse order (bottom to top). // size_allocate signals occur in reverse order (bottom to top).
// Things work better if the initial wxSizeEvents are sent (from the // Things work better if the initial wxSizeEvents are sent (from the