diff options
author | Jonas Ådahl <jadahl@gmail.com> | 2020-12-03 23:20:31 +0100 |
---|---|---|
committer | Jonas Ådahl <jadahl@gmail.com> | 2020-12-07 20:37:29 +0100 |
commit | 5eee1dfcd1803d359de5039243ed6b9e2d98d94e (patch) | |
tree | 53f35f1764a326048417c125700d47e54604e31e | |
parent | 19d2a4ab947f807b68a5d2cda5c68b6bfa0a5d17 (diff) | |
download | gtk+-5eee1dfcd1803d359de5039243ed6b9e2d98d94e.tar.gz |
gdk/popup: Remove the popup-layout-changed signal
It was replaced with GdkSurface::layout.
-rw-r--r-- | gdk/gdkpopup.c | 28 | ||||
-rw-r--r-- | gdk/macos/gdkmacossurface.c | 2 | ||||
-rw-r--r-- | gtk/gtkpopover.c | 12 |
3 files changed, 1 insertions, 41 deletions
diff --git a/gdk/gdkpopup.c b/gdk/gdkpopup.c index bcd8c8ed29..6e45e9f93e 100644 --- a/gdk/gdkpopup.c +++ b/gdk/gdkpopup.c @@ -38,15 +38,6 @@ 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, @@ -101,25 +92,6 @@ gdk_popup_default_init (GdkPopupInterface *iface) P_("Whether to hide on outside clicks"), 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/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c index 4f0617e878..705ae1d5ce 100644 --- a/gdk/macos/gdkmacossurface.c +++ b/gdk/macos/gdkmacossurface.c @@ -85,7 +85,7 @@ _gdk_macos_surface_reposition_children (GdkMacosSurface *self) } if (GDK_IS_POPUP (self) && self->did_initial_present) - g_signal_emit_by_name (self, "popup-layout-changed"); + gdk_surface_request_layout (GDK_SURFACE (self)); } static void diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c index 7fcfac9b66..21e7f2e716 100644 --- a/gtk/gtkpopover.c +++ b/gtk/gtkpopover.c @@ -767,16 +767,6 @@ surface_event (GdkSurface *surface, } static void -popup_layout_changed (GdkSurface *surface, - GtkWidget *widget) -{ - GtkPopover *popover = GTK_POPOVER (widget); - GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover); - - update_popover_layout (popover, gdk_popup_layout_ref (priv->layout)); -} - -static void gtk_popover_activate_default (GtkPopover *popover) { GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover); @@ -894,7 +884,6 @@ gtk_popover_realize (GtkWidget *widget) g_signal_connect_swapped (priv->surface, "notify::mapped", G_CALLBACK (surface_mapped_changed), widget); g_signal_connect (priv->surface, "render", G_CALLBACK (surface_render), widget); g_signal_connect (priv->surface, "event", G_CALLBACK (surface_event), widget); - g_signal_connect (priv->surface, "popup-layout-changed", G_CALLBACK (popup_layout_changed), widget); GTK_WIDGET_CLASS (gtk_popover_parent_class)->realize (widget); @@ -919,7 +908,6 @@ gtk_popover_unrealize (GtkWidget *widget) g_signal_handlers_disconnect_by_func (priv->surface, surface_mapped_changed, widget); g_signal_handlers_disconnect_by_func (priv->surface, surface_render, widget); g_signal_handlers_disconnect_by_func (priv->surface, surface_event, widget); - g_signal_handlers_disconnect_by_func (priv->surface, popup_layout_changed, widget); gdk_surface_set_widget (priv->surface, NULL); gdk_surface_destroy (priv->surface); g_clear_object (&priv->surface); |