callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gesture single: Use gtk_simulate_touchscreen

Browse Source 
Instead of manual tests.
This commit is contained in:
Matthias Clasen 2015-07-31 13:45:17 -04:00
parent 72d0b4d2c2
commit 28b4599f9b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkgesturesingle.c
View File

@ -147,8 +147,7 @@ gtk_gesture_single_handle_event (GtkEventController *controller,
source = gdk_device_get_source (source_device); source = gdk_device_get_source (source_device);
if (source != GDK_SOURCE_TOUCHSCREEN) if (source != GDK_SOURCE_TOUCHSCREEN)
test_touchscreen = ((gtk_get_debug_flags () & GTK_DEBUG_TOUCHSCREEN) != 0 || test_touchscreen = gtk_simulate_touchscreen ();
g_getenv ("GTK_TEST_TOUCHSCREEN"));
switch (event->type) switch (event->type)
{ {
@ -305,8 +304,7 @@ _gtk_gesture_single_update_evmask (GtkGestureSingle *gesture)
priv = gtk_gesture_single_get_instance_private (gesture); priv = gtk_gesture_single_get_instance_private (gesture);
evmask = GDK_TOUCH_MASK; evmask = GDK_TOUCH_MASK;
if (!priv->touch_only || g_getenv ("GTK_TEST_TOUCHSCREEN") || if (!priv->touch_only || gtk_simulate_touchscreen ())
(gtk_get_debug_flags () & GTK_DEBUG_TOUCHSCREEN) != 0)
evmask |= GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | evmask |= GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_BUTTON_MOTION_MASK; GDK_BUTTON_MOTION_MASK;