[clutter] Add default closures for the signals in ClutterGestureAction



commit c8e3db105c7340e4a470dd46147712b95e90e76a
Author: Tomeu Vizoso <tomeu vizoso collabora co uk>
Date:   Wed Jul 13 18:31:22 2011 +0200

    Add default closures for the signals in ClutterGestureAction
    
    Also make sure we cancel the gesture as soon as we know we have to

 clutter/clutter-gesture-action.c |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/clutter/clutter-gesture-action.c b/clutter/clutter-gesture-action.c
index b22c4ba..d56e0d5 100644
--- a/clutter/clutter-gesture-action.c
+++ b/clutter/clutter-gesture-action.c
@@ -159,7 +159,10 @@ stage_captured_event_cb (ClutterActor       *stage,
                 g_signal_emit (action, gesture_signals[GESTURE_BEGIN], 0, actor,
                                &return_value);
                 if (!return_value)
-                  cancel_gesture (action);
+                  {
+                    cancel_gesture (action);
+                    return FALSE;
+                  }
               }
             else
               return FALSE;
@@ -168,7 +171,10 @@ stage_captured_event_cb (ClutterActor       *stage,
           g_signal_emit (action, gesture_signals[GESTURE_PROGRESS], 0, actor,
                          &return_value);
           if (!return_value)
-            cancel_gesture (action);
+            {
+              cancel_gesture (action);
+              return FALSE;
+            }
       }
       break;
 
@@ -254,6 +260,13 @@ clutter_gesture_action_set_actor (ClutterActorMeta *meta,
   meta_class->set_actor (meta, actor);
 }
 
+static gboolean
+default_event_handler (ClutterGestureAction *action,
+                       ClutterActor *actor)
+{
+  return TRUE;
+}
+
 static void
 clutter_gesture_action_class_init (ClutterGestureActionClass *klass)
 {
@@ -263,6 +276,10 @@ clutter_gesture_action_class_init (ClutterGestureActionClass *klass)
 
   meta_class->set_actor = clutter_gesture_action_set_actor;
 
+  klass->gesture_begin = default_event_handler;
+  klass->gesture_progress = default_event_handler;
+  klass->gesture_end = default_event_handler;
+
   /**
    * ClutterGestureAction::gesture-begin:
    * @action: the #ClutterGestureAction that emitted the signal



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]