[clutter] click-action: Use the new symbolic event propagation macros
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] click-action: Use the new symbolic event propagation macros
- Date: Thu, 12 Jan 2012 10:41:21 +0000 (UTC)
commit 20e63532a4ed9b2a3476f0bf5e7cd45279ee2d13
Author: Emmanuele Bassi <ebassi gnome org>
Date: Thu Jan 12 10:27:17 2012 +0000
click-action: Use the new symbolic event propagation macros
clutter/clutter-click-action.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/clutter/clutter-click-action.c b/clutter/clutter-click-action.c
index 8f0844e..1692067 100644
--- a/clutter/clutter-click-action.c
+++ b/clutter/clutter-click-action.c
@@ -279,19 +279,19 @@ on_event (ClutterActor *actor,
ClutterClickActionPrivate *priv = action->priv;
if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (action)))
- return FALSE;
+ return CLUTTER_EVENT_PROPAGATE;
switch (clutter_event_type (event))
{
case CLUTTER_BUTTON_PRESS:
if (clutter_event_get_click_count (event) != 1)
- return FALSE;
+ return CLUTTER_EVENT_PROPAGATE;
if (priv->is_held)
- return TRUE;
+ return CLUTTER_EVENT_STOP;
if (!clutter_actor_contains (actor, clutter_event_get_source (event)))
- return FALSE;
+ return CLUTTER_EVENT_PROPAGATE;
priv->press_button = clutter_event_get_button (event);
priv->modifier_state = clutter_event_get_state (event);
@@ -333,7 +333,7 @@ on_event (ClutterActor *actor,
break;
}
- return FALSE;
+ return CLUTTER_EVENT_PROPAGATE;
}
static gboolean
@@ -351,11 +351,11 @@ on_captured_event (ClutterActor *stage,
{
case CLUTTER_BUTTON_RELEASE:
if (!priv->is_held)
- return TRUE;
+ return CLUTTER_EVENT_STOP;
if (clutter_event_get_button (event) != priv->press_button ||
clutter_event_get_click_count (event) != 1)
- return FALSE;
+ return CLUTTER_EVENT_PROPAGATE;
click_action_set_held (action, FALSE);
click_action_cancel_long_press (action);
@@ -374,7 +374,7 @@ on_captured_event (ClutterActor *stage,
}
if (!clutter_actor_contains (actor, clutter_event_get_source (event)))
- return FALSE;
+ return CLUTTER_EVENT_PROPAGATE;
/* exclude any button-mask so that we can compare
* the press and release states properly */
@@ -402,7 +402,7 @@ on_captured_event (ClutterActor *stage,
gfloat delta_x, delta_y;
if (!priv->is_held)
- return FALSE;
+ return CLUTTER_EVENT_PROPAGATE;
clutter_event_get_coords (event, &motion_x, &motion_y);
@@ -419,7 +419,7 @@ on_captured_event (ClutterActor *stage,
break;
}
- return FALSE;
+ return CLUTTER_EVENT_STOP;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]