diff --git a/ChangeLog b/ChangeLog index 85e21e8f78..f18fe87bdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Fri Sep 1 15:34:46 2000 Owen Taylor + + * gdk/x11/gdkwindow-x11.c (gdk_window_move): Fix bug where + moving a toplevel window immediately after sizing it would + result in it being sized back to the old size since + impl->width, impl->height aren't updated until we hear + back from the server. There is still a (longstanding) bug + here that gdk_window_get_size() will give the wrong size + until we do hear back. + 2000-08-31 Havoc Pennington * gtk/gtktextiter.h, gtk/gtktextiter.c, gtk/gtktextlayout.h, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 85e21e8f78..f18fe87bdd 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +Fri Sep 1 15:34:46 2000 Owen Taylor + + * gdk/x11/gdkwindow-x11.c (gdk_window_move): Fix bug where + moving a toplevel window immediately after sizing it would + result in it being sized back to the old size since + impl->width, impl->height aren't updated until we hear + back from the server. There is still a (longstanding) bug + here that gdk_window_get_size() will give the wrong size + until we do hear back. + 2000-08-31 Havoc Pennington * gtk/gtktextiter.h, gtk/gtktextiter.c, gtk/gtktextlayout.h, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 85e21e8f78..f18fe87bdd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Fri Sep 1 15:34:46 2000 Owen Taylor + + * gdk/x11/gdkwindow-x11.c (gdk_window_move): Fix bug where + moving a toplevel window immediately after sizing it would + result in it being sized back to the old size since + impl->width, impl->height aren't updated until we hear + back from the server. There is still a (longstanding) bug + here that gdk_window_get_size() will give the wrong size + until we do hear back. + 2000-08-31 Havoc Pennington * gtk/gtktextiter.h, gtk/gtktextiter.c, gtk/gtktextlayout.h, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 85e21e8f78..f18fe87bdd 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Fri Sep 1 15:34:46 2000 Owen Taylor + + * gdk/x11/gdkwindow-x11.c (gdk_window_move): Fix bug where + moving a toplevel window immediately after sizing it would + result in it being sized back to the old size since + impl->width, impl->height aren't updated until we hear + back from the server. There is still a (longstanding) bug + here that gdk_window_get_size() will give the wrong size + until we do hear back. + 2000-08-31 Havoc Pennington * gtk/gtktextiter.h, gtk/gtktextiter.c, gtk/gtktextlayout.h, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 85e21e8f78..f18fe87bdd 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Fri Sep 1 15:34:46 2000 Owen Taylor + + * gdk/x11/gdkwindow-x11.c (gdk_window_move): Fix bug where + moving a toplevel window immediately after sizing it would + result in it being sized back to the old size since + impl->width, impl->height aren't updated until we hear + back from the server. There is still a (longstanding) bug + here that gdk_window_get_size() will give the wrong size + until we do hear back. + 2000-08-31 Havoc Pennington * gtk/gtktextiter.h, gtk/gtktextiter.c, gtk/gtktextlayout.h, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 85e21e8f78..f18fe87bdd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Fri Sep 1 15:34:46 2000 Owen Taylor + + * gdk/x11/gdkwindow-x11.c (gdk_window_move): Fix bug where + moving a toplevel window immediately after sizing it would + result in it being sized back to the old size since + impl->width, impl->height aren't updated until we hear + back from the server. There is still a (longstanding) bug + here that gdk_window_get_size() will give the wrong size + until we do hear back. + 2000-08-31 Havoc Pennington * gtk/gtktextiter.h, gtk/gtktextiter.c, gtk/gtktextlayout.h, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 85e21e8f78..f18fe87bdd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Fri Sep 1 15:34:46 2000 Owen Taylor + + * gdk/x11/gdkwindow-x11.c (gdk_window_move): Fix bug where + moving a toplevel window immediately after sizing it would + result in it being sized back to the old size since + impl->width, impl->height aren't updated until we hear + back from the server. There is still a (longstanding) bug + here that gdk_window_get_size() will give the wrong size + until we do hear back. + 2000-08-31 Havoc Pennington * gtk/gtktextiter.h, gtk/gtktextiter.c, gtk/gtktextlayout.h, diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index bef8eef79b..73ec1fe315 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -749,9 +749,19 @@ gdk_window_move (GdkWindow *window, g_return_if_fail (GDK_IS_WINDOW (window)); impl = GDK_WINDOW_IMPL_X11 (private->impl); - - gdk_window_move_resize (window, x, y, - impl->width, impl->height); + + if (!GDK_WINDOW_DESTROYED (window)) + { + if (GDK_WINDOW_TYPE (private) == GDK_WINDOW_CHILD) + _gdk_window_move_resize_child (window, x, y, + impl->width, impl->height); + else + { + XMoveWindow (GDK_WINDOW_XDISPLAY (window), + GDK_WINDOW_XID (window), + x, y); + } + } } void @@ -814,6 +824,7 @@ gdk_window_move_resize (GdkWindow *window, XMoveResizeWindow (GDK_WINDOW_XDISPLAY (window), GDK_WINDOW_XID (window), x, y, width, height); + private->resize_count += 1; } } }