From 0ea25d661b887c27beaf0bd848dfda994d88782f Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 4 Feb 2010 18:29:47 +0000 Subject: [PATCH] event: Do not generate click count for SCROLL events The ClutterScrollEvent structure does not have a click count field, so Clutter should not generate the click count for events of type CLUTTER_SCROLL. --- clutter/clutter-main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c index 6347031ae..3c84c8b06 100644 --- a/clutter/clutter-main.c +++ b/clutter/clutter-main.c @@ -2084,7 +2084,8 @@ event_click_count_generate (ClutterEvent *event) break; default: - g_assert (NULL); + g_assert_not_reached (); + break; } if (event->type == CLUTTER_BUTTON_PRESS && device != NULL) @@ -2411,7 +2412,9 @@ _clutter_process_event_details (ClutterActor *stage, x, y, actor); - if (event->type != CLUTTER_MOTION) + /* button presses and releases need a click count */ + if (event->type == CLUTTER_BUTTON_PRESS || + event->type == CLUTTER_BUTTON_RELEASE) { /* Generate click count */ event_click_count_generate (event);