summaryrefslogtreecommitdiff
path: root/demos/gtk-demo/multitouch.c
diff options
context:
space:
mode:
Diffstat (limited to 'demos/gtk-demo/multitouch.c')
-rw-r--r--demos/gtk-demo/multitouch.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/demos/gtk-demo/multitouch.c b/demos/gtk-demo/multitouch.c
index a85161f638..0fcec64ca0 100644
--- a/demos/gtk-demo/multitouch.c
+++ b/demos/gtk-demo/multitouch.c
@@ -410,13 +410,14 @@ button_press_cb (GtkWidget *widget,
shape_update_scales (shape);
if (!shape->cluster)
- shape->cluster = gdk_window_create_touch_cluster (gtk_widget_get_window (widget));
-
- /* Only change cluster device if there were no touches or no device */
- if (!gdk_touch_cluster_get_device (shape->cluster) ||
- !gdk_touch_cluster_get_touches (shape->cluster))
- gdk_touch_cluster_set_device (shape->cluster,
- gdk_event_get_device (event));
+ shape->cluster = gdk_window_create_touch_cluster (gtk_widget_get_window (widget),
+ gdk_event_get_device (event));
+ else if (!gdk_touch_cluster_get_touches (shape->cluster))
+ {
+ /* Only change cluster device if there were no touches */
+ gdk_touch_cluster_set_device (shape->cluster,
+ gdk_event_get_device (event));
+ }
gdk_touch_cluster_add_touch (shape->cluster, touch_id);
return TRUE;