From 16505a4d1e351529f3a4ea0356bb538f1ecdb2d2 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 7 Aug 2020 23:26:01 -0400
Subject: [PATCH 1/2] gdk: Move the ::popup-layout-changed signal

Move this signal from GdkSurface to GtkPopup,
where it belongs.
---
 gdk/gdkpopup.c   | 28 ++++++++++++++++++++++++++++
 gdk/gdksurface.c | 20 --------------------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/gdk/gdkpopup.c b/gdk/gdkpopup.c
index 8feacd4a9b..735567fc32 100644
--- a/gdk/gdkpopup.c
+++ b/gdk/gdkpopup.c
@@ -34,6 +34,15 @@
 
 G_DEFINE_INTERFACE (GdkPopup, gdk_popup, GDK_TYPE_SURFACE)
 
+enum
+{
+  POPUP_LAYOUT_CHANGED,
+
+  N_SIGNALS
+};
+
+static guint signals[N_SIGNALS] = { 0 };
+
 static gboolean
 gdk_popup_default_present (GdkPopup       *popup,
                            int             width,
@@ -88,6 +97,25 @@ gdk_popup_default_init (GdkPopupInterface *iface)
                            P_("The parent surface"),
                            FALSE,
                            G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GdkPopup::popup-layout-changed
+   * @popup: the #GdkSurface that was laid out
+   *
+   * Emitted when the layout of a popup surface has changed, e.g. if the popup
+   * layout was reactive and after the parent moved causing the popover to end
+   * up partially off-screen.
+   */
+  signals[POPUP_LAYOUT_CHANGED] =
+    g_signal_new (g_intern_static_string ("popup-layout-changed"),
+                  GDK_TYPE_POPUP,
+                  G_SIGNAL_RUN_FIRST,
+                  0,
+                  NULL,
+                  NULL,
+                  NULL,
+                  G_TYPE_NONE,
+                  0);
 }
 
 /**
diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index 7049d3c560..09bf78e20c 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -524,26 +524,6 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
 
   g_object_class_install_properties (object_class, LAST_PROP, properties);
 
-  /**
-   * GdkSurface::popup-layout-changed
-   * @surface: the #GdkSurface that was laid out
-   *
-   * Emitted when the layout of a popup @surface has changed, e.g. if the popup
-   * layout was reactive and after the parent moved causing the popover to end
-   * up partially off-screen.
-   *
-   */
-  signals[POPUP_LAYOUT_CHANGED] =
-    g_signal_new (g_intern_static_string ("popup-layout-changed"),
-                  G_OBJECT_CLASS_TYPE (object_class),
-                  G_SIGNAL_RUN_FIRST,
-                  0,
-                  NULL,
-                  NULL,
-                  NULL,
-                  G_TYPE_NONE,
-                  0);
-
   /**
    * GdkSurface::size-changed:
    * @surface: the #GdkSurface

From fd1033f974b87ffbdafc40ae8615408d73eb02d1 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 7 Aug 2020 23:38:28 -0400
Subject: [PATCH 2/2] surface: Add width and height properties

---
 gdk/gdksurface.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index 09bf78e20c..db48e34f5a 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -84,6 +84,8 @@ enum {
   PROP_DISPLAY,
   PROP_FRAME_CLOCK,
   PROP_MAPPED,
+  PROP_WIDTH,
+  PROP_HEIGHT,
   LAST_PROP
 };
 
@@ -522,6 +524,20 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
                             FALSE,
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
+  properties[PROP_WIDTH] =
+      g_param_spec_int ("width",
+                        P_("Width"),
+                        P_("Width"),
+                        0, G_MAXINT, 0,
+                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+  properties[PROP_HEIGHT] =
+      g_param_spec_int ("height",
+                        P_("Height"),
+                        P_("Height"),
+                        0, G_MAXINT, 0,
+                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
   g_object_class_install_properties (object_class, LAST_PROP, properties);
 
   /**
@@ -742,6 +758,14 @@ gdk_surface_get_property (GObject    *object,
       g_value_set_boolean (value, GDK_SURFACE_IS_MAPPED (surface));
       break;
 
+    case PROP_WIDTH:
+      g_value_set_int (value, surface->width);
+      break;
+
+    case PROP_HEIGHT:
+      g_value_set_int (value, surface->height);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -755,6 +779,9 @@ _gdk_surface_update_size (GdkSurface *surface)
 
   for (l = surface->draw_contexts; l; l = l->next)
     gdk_draw_context_surface_resized (l->data);
+
+  g_object_notify (G_OBJECT (surface), "width");
+  g_object_notify (G_OBJECT (surface), "height");
 }
 
 static GdkSurface *