AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

testgtk: Use an event controller for 'testing scrolling'

Browse Source 
The current code was not working with smooth scroll events,
for starters.
This commit is contained in:
Matthias Clasen 2018-01-01 10:59:48 -05:00
parent 97f805b888
commit 6ac33215a5
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/testgtk.c
View File

@ -7057,21 +7057,17 @@ scroll_test_draw (GtkDrawingArea *darea,
cairo_fill (cr);
}
static gint
scroll_test_scroll (GtkWidget *widget, GdkEventScroll *event,
GtkAdjustment *adjustment)
static void
scroll_test_scroll (GtkEventControllerScroll *scroll,
double dx,
double dy,
GtkAdjustment *adjustment)
{
GdkScrollDirection direction;
gdouble new_value;
gdk_event_get_scroll_direction ((GdkEvent *)event, &direction);
new_value = gtk_adjustment_get_value (adjustment) + (direction == GDK_SCROLL_UP ?
-gtk_adjustment_get_page_increment (adjustment) / 2:
gtk_adjustment_get_page_increment (adjustment) / 2);
new_value = gtk_adjustment_get_value (adjustment) + dy * gtk_adjustment_get_page_increment (adjustment) / 2;
new_value = CLAMP (new_value, gtk_adjustment_get_lower (adjustment), gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_page_size (adjustment));
gtk_adjustment_set_value (adjustment, new_value);
return TRUE;
gtk_adjustment_set_value (adjustment, new_value);
}
static void
@ -7116,6 +7112,7 @@ create_scroll_test (GtkWidget *widget)
GtkWidget *drawing_area;
GtkWidget *scrollbar;
GtkAdjustment *adjustment;
GtkEventController *controller;
if (!window)
{
@ -7157,9 +7154,10 @@ create_scroll_test (GtkWidget *widget)
g_signal_connect (drawing_area, "configure_event",
G_CALLBACK (scroll_test_configure), adjustment);
g_signal_connect (drawing_area, "scroll_event",
G_CALLBACK (scroll_test_scroll), adjustment);
controller = gtk_event_controller_scroll_new (drawing_area, GTK_EVENT_CONTROLLER_SCROLL_VERTICAL);
g_object_set_data_full (G_OBJECT (drawing_area), "scroll", controller, g_object_unref);
g_signal_connect (controller, "scroll", G_CALLBACK (scroll_test_scroll), adjustment);
g_signal_connect (adjustment, "value_changed",
G_CALLBACK (scroll_test_adjustment_changed),
drawing_area);