From: Benjamin Otte <otte@redhat.com>
Date: Fri, 8 Feb 2019 17:18:55 +0000 (+0100)
Subject: revealer: Use gtk_widget_set_overflow()
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~21^2~737
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3f2934bff9579f9aa0b794ddde0d0a9c0cdeaed5;p=gtk4.git

revealer: Use gtk_widget_set_overflow()
---

diff --git a/gtk/gtkrevealer.c b/gtk/gtkrevealer.c
index 508c7d2127..3f521baa4c 100644
--- a/gtk/gtkrevealer.c
+++ b/gtk/gtkrevealer.c
@@ -28,7 +28,6 @@
 #include "gtkprivate.h"
 #include "gtkprogresstrackerprivate.h"
 #include "gtksettingsprivate.h"
-#include "gtksnapshot.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 
@@ -108,8 +107,6 @@ static void gtk_revealer_measure (GtkWidget      *widget,
                                   int            *natural,
                                   int            *minimum_baseline,
                                   int            *natural_baseline);
-static void     gtk_revealer_snapshot                            (GtkWidget     *widget,
-                                                                  GtkSnapshot   *snapshot);
 
 static void     gtk_revealer_set_position (GtkRevealer *revealer,
                                            gdouble      pos);
@@ -126,7 +123,8 @@ gtk_revealer_init (GtkRevealer *revealer)
   priv->current_pos = 0.0;
   priv->target_pos = 0.0;
 
-  gtk_widget_set_has_surface ((GtkWidget*) revealer, FALSE);
+  gtk_widget_set_has_surface (GTK_WIDGET (revealer), FALSE);
+  gtk_widget_set_overflow (GTK_WIDGET (revealer), GTK_OVERFLOW_HIDDEN);
 }
 
 static void
@@ -228,7 +226,6 @@ gtk_revealer_class_init (GtkRevealerClass *klass)
   widget_class->unmap = gtk_revealer_unmap;
   widget_class->size_allocate = gtk_revealer_real_size_allocate;
   widget_class->measure = gtk_revealer_measure;
-  widget_class->snapshot = gtk_revealer_snapshot;
 
   container_class->add = gtk_revealer_real_add;
 
@@ -579,39 +576,6 @@ gtk_revealer_measure (GtkWidget      *widget,
   *natural = ceil (*natural * scale);
 }
 
-static void
-gtk_revealer_snapshot (GtkWidget   *widget,
-                       GtkSnapshot *snapshot)
-{
-  GtkRevealer *revealer = GTK_REVEALER (widget);
-  GtkRevealerPrivate *priv = gtk_revealer_get_instance_private (revealer);
-  GtkRevealerTransitionType transition;
-  GtkWidget *child;
-  gboolean clip_child;
-
-  child = gtk_bin_get_child (GTK_BIN (revealer));
-  if (child == NULL || !gtk_widget_get_mapped (child))
-    return;
-
-  transition = effective_transition (revealer);
-  clip_child = transition != GTK_REVEALER_TRANSITION_TYPE_NONE &&
-               transition != GTK_REVEALER_TRANSITION_TYPE_CROSSFADE &&
-               gtk_progress_tracker_get_state (&priv->tracker) != GTK_PROGRESS_STATE_AFTER;
-  if (clip_child)
-    {
-      gtk_snapshot_push_clip (snapshot,
-                              &GRAPHENE_RECT_INIT(
-                                  0, 0,
-                                  gtk_widget_get_width (widget),
-                                  gtk_widget_get_height (widget)
-                              ));
-      gtk_widget_snapshot_child (widget, child, snapshot);
-      gtk_snapshot_pop (snapshot);
-    }
-  else
-    gtk_widget_snapshot_child (widget, child, snapshot);
-}
-
 /**
  * gtk_revealer_get_transition_duration:
  * @revealer: a #GtkRevealer