[gtk/wip/matthiasc/popup2: 50/51] popup: fix re-showing

[Matthias Clasen <matthiasc src gnome org>]

commit 06e2a4da8f060ebac60f905cba7e1e531297ef8f
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Mar 18 08:36:25 2019 -0400

    popup: fix re-showing

 gtk/gtkpopup.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/gtk/gtkpopup.c b/gtk/gtkpopup.c
index b946543e1d..1910cb124f 100644
--- a/gtk/gtkpopup.c
+++ b/gtk/gtkpopup.c
@@ -116,7 +116,6 @@ gtk_popup_move_resize (GtkPopup *popup)
   gtk_widget_translate_coordinates (priv->relative_to,
                                     GTK_WIDGET (gtk_widget_get_root (priv->relative_to)),
                                     rect.x, rect.y, &rect.x, &rect.y);
-  gdk_surface_move_resize (priv->surface, rect.x, rect.y, rect.width, rect.height);
 #if 0
   gdk_surface_move_to_rect (priv->surface,
                             &rect,
@@ -124,6 +123,8 @@ gtk_popup_move_resize (GtkPopup *popup)
                             GDK_GRAVITY_NORTH,
                             GDK_ANCHOR_FLIP_Y,
                             0, 10);
+#else
+  gdk_surface_move_resize (priv->surface, rect.x, rect.y, req.width, req.height);
 #endif
 }
 
@@ -290,6 +291,7 @@ gtk_popup_show (GtkWidget *widget)
   _gtk_widget_set_visible_flag (widget, TRUE);
   gtk_css_node_validate (gtk_widget_get_css_node (widget));
   gtk_widget_realize (widget);
+  gtk_popup_root_check_resize (GTK_ROOT (widget));
   gtk_widget_map (widget);
 
   if (!gtk_widget_get_focus_child (widget))