[gnome-documents/gnome-3-22] nav-bar: make sure to set the transient parent to the preview window

[Debarshi Ray <debarshir src gnome org>]

commit c8ff846c329c59fcd576fc2f5bdcca97f6021eec
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sun Nov 27 15:14:19 2016 +0100

    nav-bar: make sure to set the transient parent to the preview window
    
    Otherwise, we would not have all the information to properly position
    the window under Wayland.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=775151

 src/lib/gd-nav-bar.c |  104 +++++++++++++++++++++++++++++--------------------
 1 files changed, 61 insertions(+), 43 deletions(-)
---
diff --git a/src/lib/gd-nav-bar.c b/src/lib/gd-nav-bar.c
index 9132574..13a77cd 100644
--- a/src/lib/gd-nav-bar.c
+++ b/src/lib/gd-nav-bar.c
@@ -759,6 +759,66 @@ gd_nav_bar_draw (GtkWidget *widget,
 }
 
 static void
+create_preview_window (GdNavBar *self)
+{
+        GtkStyleContext *context;
+        GtkWidget *box, *toplevel;
+        GdkScreen *screen;
+        GdkVisual *visual;
+
+        toplevel = gtk_widget_get_toplevel (GTK_WIDGET (self));
+        if (!toplevel) {
+                return;
+        }
+
+        self->priv->preview_window = gtk_window_new (GTK_WINDOW_POPUP);
+        screen = gtk_widget_get_screen (self->priv->preview_window);
+        visual = gdk_screen_get_rgba_visual (screen);
+
+        if (visual != NULL) {
+                gtk_widget_set_visual (self->priv->preview_window, visual);
+        }
+
+        gtk_window_set_type_hint (GTK_WINDOW (self->priv->preview_window), GDK_WINDOW_TYPE_HINT_TOOLTIP);
+        gtk_window_set_resizable (GTK_WINDOW (self->priv->preview_window), FALSE);
+        gtk_window_set_transient_for (GTK_WINDOW (self->priv->preview_window),
+                                      GTK_WINDOW (toplevel));
+
+        context = gtk_widget_get_style_context (self->priv->preview_window);
+        gtk_style_context_add_class (context, GTK_STYLE_CLASS_TOOLTIP);
+
+        box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+        gtk_widget_set_margin_start (box, 6);
+        gtk_widget_set_margin_end (box, 6);
+        gtk_widget_set_margin_top (box, 6);
+        gtk_widget_set_margin_bottom (box, 6);
+        gtk_container_add (GTK_CONTAINER (self->priv->preview_window), box);
+        gtk_widget_show (box);
+
+        self->priv->preview_image = gtk_image_new ();
+        gtk_widget_set_size_request (self->priv->preview_image, PREVIEW_WIDTH, -1);
+        gtk_box_pack_start (GTK_BOX (box), self->priv->preview_image, FALSE, FALSE, 0);
+
+        self->priv->preview_label = gtk_label_new ("");
+        gtk_label_set_line_wrap (GTK_LABEL (self->priv->preview_label), TRUE);
+        gtk_box_pack_start (GTK_BOX (box), self->priv->preview_label, FALSE, FALSE, 0);
+
+        gtk_widget_show_all (box);
+}
+
+static void
+gd_nav_bar_hierarchy_changed (GtkWidget *widget,
+                              GtkWidget *previous_toplevel)
+{
+        GdNavBar *self = GD_NAV_BAR (widget);
+
+        /* Initialize preview window when in a toplevel */
+        if (previous_toplevel == NULL) {
+                create_preview_window (self);
+        }
+}
+
+static void
 gd_nav_bar_class_init (GdNavBarClass *class)
 {
         GObjectClass *oclass = G_OBJECT_CLASS (class);
@@ -773,6 +833,7 @@ gd_nav_bar_class_init (GdNavBarClass *class)
         wclass->enter_notify_event = gd_nav_bar_enter_notify;
         wclass->leave_notify_event = gd_nav_bar_leave_notify;
         wclass->size_allocate = gd_nav_bar_size_allocate;
+        wclass->hierarchy_changed = gd_nav_bar_hierarchy_changed;
 
         g_object_class_install_property (oclass,
                                          PROP_DOCUMENT_MODEL,
@@ -967,47 +1028,6 @@ scale_motion_notify_cb (GtkWidget *widget,
         return FALSE;
 }
 
-static void
-create_preview_window (GdNavBar *self)
-{
-        GtkStyleContext *context;
-        GtkWidget *box;
-        GdkScreen *screen;
-        GdkVisual *visual;
-
-        self->priv->preview_window = gtk_window_new (GTK_WINDOW_POPUP);
-        screen = gtk_widget_get_screen (self->priv->preview_window);
-        visual = gdk_screen_get_rgba_visual (screen);
-
-        if (visual != NULL) {
-                gtk_widget_set_visual (self->priv->preview_window, visual);
-        }
-
-        gtk_window_set_type_hint (GTK_WINDOW (self->priv->preview_window), GDK_WINDOW_TYPE_HINT_TOOLTIP);
-        gtk_window_set_resizable (GTK_WINDOW (self->priv->preview_window), FALSE);
-
-        context = gtk_widget_get_style_context (self->priv->preview_window);
-        gtk_style_context_add_class (context, GTK_STYLE_CLASS_TOOLTIP);
-
-        box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-        gtk_widget_set_margin_start (box, 6);
-        gtk_widget_set_margin_end (box, 6);
-        gtk_widget_set_margin_top (box, 6);
-        gtk_widget_set_margin_bottom (box, 6);
-        gtk_container_add (GTK_CONTAINER (self->priv->preview_window), box);
-        gtk_widget_show (box);
-
-        self->priv->preview_image = gtk_image_new ();
-        gtk_widget_set_size_request (self->priv->preview_image, PREVIEW_WIDTH, -1);
-        gtk_box_pack_start (GTK_BOX (box), self->priv->preview_image, FALSE, FALSE, 0);
-
-        self->priv->preview_label = gtk_label_new ("");
-        gtk_label_set_line_wrap (GTK_LABEL (self->priv->preview_label), TRUE);
-        gtk_box_pack_start (GTK_BOX (box), self->priv->preview_label, FALSE, FALSE, 0);
-
-        gtk_widget_show_all (box);
-}
-
 /**
  * gd_nav_bar_get_button_area:
  * @bar: a #GdNavBar
@@ -1087,8 +1107,6 @@ gd_nav_bar_init (GdNavBar *self)
         g_signal_connect (priv->scale, "motion-notify-event",
                           G_CALLBACK (scale_motion_notify_cb),
                           self);
-
-        create_preview_window (self);
 }
 
 gboolean