Save x and y in window_private.

2002-04-21  Alexander Larsson  <alla@lysator.liu.se>

	* 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.

8 files changed, 62 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ac960e7772..6c49ca7e36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-21  Alexander Larsson  <alla@lysator.liu.se>
+
+	* 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  <maclas@gmx.de>
 
 	* 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  <alla@lysator.liu.se>
+
+	* 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  <maclas@gmx.de>
 
 	* 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  <alla@lysator.liu.se>
+
+	* 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  <maclas@gmx.de>
 
 	* 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  <alla@lysator.liu.se>
+
+	* 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  <maclas@gmx.de>
 
 	* 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  <alla@lysator.liu.se>
+
+	* 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  <maclas@gmx.de>
 
 	* 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  <alla@lysator.liu.se>
+
+	* 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  <maclas@gmx.de>
 
 	* 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));