From 398e83736aaf408129e0c2301ebc27f8aad33d06 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Sun, 21 Apr 2002 19:17:58 +0000 Subject: [PATCH] Save x and y in window_private. 2002-04-21 Alexander Larsson * gdk/x11/gdkwindow-x11.c (gdk_window_reparent): Save x and y in window_private. * gtk/gtkplug.c (_gtk_plug_add_to_socket): Move plug window outside the visible area to avoid flashing until the first size_allocate. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gdk/x11/gdkwindow-x11.c | 3 +++ gtk/gtkplug.c | 6 +++++- 8 files changed, 62 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ac960e7772..6c49ca7e36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-04-21 Alexander Larsson + + * gdk/x11/gdkwindow-x11.c (gdk_window_reparent): + Save x and y in window_private. + + * gtk/gtkplug.c (_gtk_plug_add_to_socket): + Move plug window outside the visible area to avoid flashing until + the first size_allocate. + 2002-04-21 Matthias Clasen * gtk/gtktextiter.c (gtk_text_iter_forward_search): More verbose diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ac960e7772..6c49ca7e36 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2002-04-21 Alexander Larsson + + * gdk/x11/gdkwindow-x11.c (gdk_window_reparent): + Save x and y in window_private. + + * gtk/gtkplug.c (_gtk_plug_add_to_socket): + Move plug window outside the visible area to avoid flashing until + the first size_allocate. + 2002-04-21 Matthias Clasen * gtk/gtktextiter.c (gtk_text_iter_forward_search): More verbose diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ac960e7772..6c49ca7e36 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2002-04-21 Alexander Larsson + + * gdk/x11/gdkwindow-x11.c (gdk_window_reparent): + Save x and y in window_private. + + * gtk/gtkplug.c (_gtk_plug_add_to_socket): + Move plug window outside the visible area to avoid flashing until + the first size_allocate. + 2002-04-21 Matthias Clasen * gtk/gtktextiter.c (gtk_text_iter_forward_search): More verbose diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ac960e7772..6c49ca7e36 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2002-04-21 Alexander Larsson + + * gdk/x11/gdkwindow-x11.c (gdk_window_reparent): + Save x and y in window_private. + + * gtk/gtkplug.c (_gtk_plug_add_to_socket): + Move plug window outside the visible area to avoid flashing until + the first size_allocate. + 2002-04-21 Matthias Clasen * gtk/gtktextiter.c (gtk_text_iter_forward_search): More verbose diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ac960e7772..6c49ca7e36 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2002-04-21 Alexander Larsson + + * gdk/x11/gdkwindow-x11.c (gdk_window_reparent): + Save x and y in window_private. + + * gtk/gtkplug.c (_gtk_plug_add_to_socket): + Move plug window outside the visible area to avoid flashing until + the first size_allocate. + 2002-04-21 Matthias Clasen * gtk/gtktextiter.c (gtk_text_iter_forward_search): More verbose diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ac960e7772..6c49ca7e36 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2002-04-21 Alexander Larsson + + * gdk/x11/gdkwindow-x11.c (gdk_window_reparent): + Save x and y in window_private. + + * gtk/gtkplug.c (_gtk_plug_add_to_socket): + Move plug window outside the visible area to avoid flashing until + the first size_allocate. + 2002-04-21 Matthias Clasen * gtk/gtktextiter.c (gtk_text_iter_forward_search): More verbose diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 912907d348..67b540cf53 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -1251,6 +1251,9 @@ gdk_window_reparent (GdkWindow *window, GDK_WINDOW_XID (new_parent), x, y); + window_private->x = x; + window_private->y = y; + /* From here on, we treat parents of type GDK_WINDOW_FOREIGN like * the root window */ diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c index b179fe865f..7b6d39172f 100644 --- a/gtk/gtkplug.c +++ b/gtk/gtkplug.c @@ -217,6 +217,7 @@ _gtk_plug_add_to_socket (GtkPlug *plug, GtkSocket *socket) { GtkWidget *widget; + gint w, h; g_return_if_fail (GTK_IS_PLUG (plug)); g_return_if_fail (GTK_IS_SOCKET (socket)); @@ -232,7 +233,10 @@ _gtk_plug_add_to_socket (GtkPlug *plug, plug->socket_window = GTK_WIDGET (socket)->window; if (GTK_WIDGET_REALIZED (widget)) - gdk_window_reparent (widget->window, plug->socket_window, 0, 0); + { + gdk_drawable_get_size (GDK_DRAWABLE (widget->window), &w, &h); + gdk_window_reparent (widget->window, plug->socket_window, -w, -h); + } gtk_widget_set_parent (widget, GTK_WIDGET (socket));