From: Benjamin Otte <otte@redhat.com>
Date: Sun, 5 Nov 2017 15:12:35 +0000 (+0100)
Subject: emojichooser: animate the adjustment
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~23^2~852
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1cee71049a7857177e979c4a8ea63abe52f516d4;p=gtk4.git

emojichooser: animate the adjustment

... instead of doing a dance with the scrolled window to get it to scroll
the adjustment.
---

diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c
index 7aed429ed5..8902b2c3e1 100644
--- a/gtk/gtkemojichooser.c
+++ b/gtk/gtkemojichooser.c
@@ -19,7 +19,7 @@
 
 #include "gtkemojichooser.h"
 
-#include "gtkadjustment.h"
+#include "gtkadjustmentprivate.h"
 #include "gtkbox.h"
 #include "gtkbutton.h"
 #include "gtkcssprovider.h"
@@ -102,19 +102,13 @@ scroll_to_section (GtkButton *button,
   GtkEmojiChooser *chooser;
   GtkAdjustment *adj;
   GtkAllocation alloc = { 0, 0, 0, 0 };
-  double page_increment, value;
-  gboolean dummy;
 
   chooser = GTK_EMOJI_CHOOSER (gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_EMOJI_CHOOSER));
 
   adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (chooser->scrolled_window));
   if (section->heading)
     gtk_widget_get_allocation (section->heading, &alloc);
-  page_increment = gtk_adjustment_get_page_increment (adj);
-  value = gtk_adjustment_get_value (adj);
-  gtk_adjustment_set_page_increment (adj, alloc.y - value);
-  g_signal_emit_by_name (chooser->scrolled_window, "scroll-child", GTK_SCROLL_PAGE_FORWARD, FALSE, &dummy);
-  gtk_adjustment_set_page_increment (adj, page_increment);
+  gtk_adjustment_animate_to_value (adj, alloc.y);
 }
 
 static void