Merge branch 'matthiasc/for-master' into 'master'

Matthiasc/for master

See merge request GNOME/gtk!3214

6 files changed, 144 insertions, 42 deletions

diff --git a/gtk/gtkgizmo.c b/gtk/gtkgizmo.c
index d1af37aa65..00162645b3 100644
--- a/gtk/gtkgizmo.c
+++ b/gtk/gtkgizmo.c
@@ -83,18 +83,6 @@ gtk_gizmo_grab_focus (GtkWidget *widget)
 }
 
 static void
-gtk_gizmo_css_changed (GtkWidget         *widget,
-                       GtkCssStyleChange *change)
-{
-  GtkGizmo *self = GTK_GIZMO (widget);
-
-  GTK_WIDGET_CLASS (gtk_gizmo_parent_class)->css_changed (widget, change);
-
-  if (self->css_changed_func)
-    self->css_changed_func (self, change);
-}
-
-static void
 gtk_gizmo_finalize (GObject *object)
 {
   GtkGizmo *self = GTK_GIZMO (object);
@@ -127,7 +115,6 @@ gtk_gizmo_class_init (GtkGizmoClass *klass)
   widget_class->contains = gtk_gizmo_contains;
   widget_class->grab_focus = gtk_gizmo_grab_focus;
   widget_class->focus = gtk_gizmo_focus;
-  widget_class->css_changed = gtk_gizmo_css_changed;
 }
 
 static void
@@ -178,12 +165,3 @@ gtk_gizmo_new_with_role (const char            *css_name,
 
   return GTK_WIDGET (gizmo);
 }
-
-void
-gtk_gizmo_set_css_changed_func (GtkGizmo               *gizmo,
-                                GtkGizmoCssChangedFunc  css_changed_func)
-{
-  g_return_if_fail (!gtk_widget_get_realized (GTK_WIDGET (gizmo)));
-
-  gizmo->css_changed_func = css_changed_func;
-}
diff --git a/gtk/gtkgizmoprivate.h b/gtk/gtkgizmoprivate.h
index a830e3550d..9257201a59 100644
--- a/gtk/gtkgizmoprivate.h
+++ b/gtk/gtkgizmoprivate.h
@@ -33,9 +33,7 @@ typedef gboolean (* GtkGizmoContainsFunc) (GtkGizmo  *gizmo,
                                            double     y);
 typedef gboolean (* GtkGizmoFocusFunc)    (GtkGizmo         *gizmo,
                                            GtkDirectionType  direction);
-typedef gboolean (* GtkGizmoGrabFocusFunc) (GtkGizmo         *gizmo);
-typedef void     (* GtkGizmoCssChangedFunc) (GtkGizmo          *gizmo,
-                                             GtkCssStyleChange *change);
+typedef gboolean (* GtkGizmoGrabFocusFunc)(GtkGizmo         *gizmo);
 
 struct _GtkGizmo
 {
@@ -47,7 +45,6 @@ struct _GtkGizmo
   GtkGizmoContainsFunc  contains_func;
   GtkGizmoFocusFunc     focus_func;
   GtkGizmoGrabFocusFunc grab_focus_func;
-  GtkGizmoCssChangedFunc css_changed_func;
 };
 
 struct _GtkGizmoClass
@@ -74,7 +71,5 @@ GtkWidget *gtk_gizmo_new_with_role (const char            *css_name,
                                     GtkGizmoFocusFunc      focus_func,
                                     GtkGizmoGrabFocusFunc  grab_focus_func);
 
-void gtk_gizmo_set_css_changed_func (GtkGizmo               *gizmo,
-                                     GtkGizmoCssChangedFunc  css_changed_func);
 
 #endif
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index b00cdd3827..3f3412ba8e 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -107,7 +107,7 @@
 #include "gtkbinlayout.h"
 #include "gtkenums.h"
 #include "gtktypebuiltins.h"
-#include "gtkgizmoprivate.h"
+#include "gtkpopovercontentprivate.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkmain.h"
@@ -881,15 +881,6 @@ node_style_changed_cb (GtkCssNode        *node,
 }
 
 static void
-contents_css_changed (GtkGizmo          *contents,
-                      GtkCssStyleChange *change)
-{
-  if (change == NULL ||
-      gtk_css_style_change_changes_property (change, GTK_CSS_PROPERTY_BOX_SHADOW))
-    gtk_widget_queue_resize (gtk_widget_get_parent (GTK_WIDGET (contents)));
-}
-
-static void
 gtk_popover_init (GtkPopover *popover)
 {
   GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
@@ -921,10 +912,8 @@ gtk_popover_init (GtkPopover *popover)
                            G_CALLBACK (node_style_changed_cb), popover, 0);
   g_object_unref (priv->arrow_node);
 
-  priv->contents_widget = gtk_gizmo_new ("contents", NULL, NULL, NULL, NULL,
-                                         (GtkGizmoFocusFunc)gtk_widget_focus_child,
-                                         (GtkGizmoGrabFocusFunc)gtk_widget_grab_focus_child);
-  gtk_gizmo_set_css_changed_func (GTK_GIZMO (priv->contents_widget), contents_css_changed);
+  priv->contents_widget = gtk_popover_content_new ();
+
   gtk_widget_set_layout_manager (priv->contents_widget, gtk_bin_layout_new ());
   gtk_widget_set_parent (priv->contents_widget, GTK_WIDGET (popover));
   gtk_widget_set_overflow (priv->contents_widget, GTK_OVERFLOW_HIDDEN);
diff --git a/gtk/gtkpopovercontent.c b/gtk/gtkpopovercontent.c
new file mode 100644
index 0000000000..92a299d571
--- /dev/null
+++ b/gtk/gtkpopovercontent.c
@@ -0,0 +1,88 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2021 Red Hat, Inc.
+ *
+ * Authors:
+ * - Matthias Clasen <mclasen@redhat.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gtkpopovercontentprivate.h"
+#include "gtkstylecontextprivate.h"
+
+#include "gtkwidgetprivate.h"
+
+/* A private class used as the child of GtkPopover. The only thing
+ * special here is that we need to queue a resize on the popover when
+ * our shadow changes.
+ */
+
+G_DEFINE_TYPE (GtkPopoverContent, gtk_popover_content, GTK_TYPE_WIDGET);
+
+static void
+gtk_popover_content_css_changed (GtkWidget         *widget,
+                                 GtkCssStyleChange *change)
+{
+  GTK_WIDGET_CLASS (gtk_popover_content_parent_class)->css_changed (widget, change);
+
+  if (change == NULL ||
+      gtk_css_style_change_changes_property (change, GTK_CSS_PROPERTY_BOX_SHADOW))
+    gtk_widget_queue_resize (gtk_widget_get_parent (widget));
+}
+
+static void
+gtk_popover_content_finalize (GObject *object)
+{
+  GtkPopoverContent *self = GTK_POPOVER_CONTENT (object);
+  GtkWidget *widget;
+
+  widget = _gtk_widget_get_first_child (GTK_WIDGET (self));
+  while (widget != NULL)
+    {
+      GtkWidget *next = _gtk_widget_get_next_sibling (widget);
+
+      gtk_widget_unparent (widget);
+
+      widget = next;
+    }
+
+  G_OBJECT_CLASS (gtk_popover_content_parent_class)->finalize (object);
+}
+
+static void
+gtk_popover_content_class_init (GtkPopoverContentClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->finalize = gtk_popover_content_finalize;
+
+  widget_class->focus = gtk_widget_focus_child;
+  widget_class->grab_focus = gtk_widget_grab_focus_child;
+  widget_class->css_changed = gtk_popover_content_css_changed;
+}
+
+static void
+gtk_popover_content_init (GtkPopoverContent *self)
+{
+}
+
+GtkWidget *
+gtk_popover_content_new (void)
+{
+  return g_object_new (GTK_TYPE_POPOVER_CONTENT,
+                       "css-name", "contents",
+                       "accessible-role", GTK_ACCESSIBLE_ROLE_WIDGET,
+                       NULL);
+}
diff --git a/gtk/gtkpopovercontentprivate.h b/gtk/gtkpopovercontentprivate.h
new file mode 100644
index 0000000000..69fe9e387c
--- /dev/null
+++ b/gtk/gtkpopovercontentprivate.h
@@ -0,0 +1,51 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2021 Red Hat, Inc.
+ *
+ * Authors:
+ * - Matthias Clasen <mclasen@redhat.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_POPOVER_CONTENT_H__
+#define __GTK_POPOVER_CONTENT_H__
+
+#include "gtkwidget.h"
+#include "gtkenums.h"
+
+#define GTK_TYPE_POPOVER_CONTENT                 (gtk_popover_content_get_type ())
+#define GTK_POPOVER_CONTENT(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_POPOVER_CONTENT, GtkPopoverContent))
+#define GTK_POPOVER_CONTENT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_POPOVER_CONTENT, GtkPopoverContentClass))
+#define GTK_IS_POPOVER_CONTENT(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_POPOVER_CONTENT))
+#define GTK_IS_POPOVER_CONTENT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_POPOVER_CONTENT))
+#define GTK_POPOVER_CONTENT_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_POPOVER_CONTENT, GtkPopoverContentClass))
+
+typedef struct _GtkPopoverContent             GtkPopoverContent;
+typedef struct _GtkPopoverContentClass        GtkPopoverContentClass;
+
+struct _GtkPopoverContent
+{
+  GtkWidget parent_instance;
+};
+
+struct _GtkPopoverContentClass
+{
+  GtkWidgetClass parent_class;
+};
+
+GType      gtk_popover_content_get_type (void) G_GNUC_CONST;
+
+GtkWidget *gtk_popover_content_new (void);
+
+#endif
diff --git a/gtk/meson.build b/gtk/meson.build
index 42cb07a205..5526cd7c5e 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -127,6 +127,7 @@ gtk_private_sources = files([
   'gtkplacesview.c',
   'gtkplacesviewrow.c',
   'gtkpointerfocus.c',
+  'gtkpopovercontent.c',
   'gtkprintutils.c',
   'gtkprivate.c',
   'gtkprogresstracker.c',