From f97d16cd2d01c7f4d44f5b6ab719878d1a5989e2 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sat, 12 Jun 2010 17:45:54 +0100 Subject: [PATCH] drag-action: Remove the press event button Both ::drag-begin and ::drag-end have a "button" argument - even though we assume internally, and externally, that dragging can only be the result of a primary button operation. --- clutter/clutter-drag-action.c | 19 +++++++------------ clutter/clutter-drag-action.h | 2 -- clutter/clutter-marshal.list | 2 +- tests/interactive/test-drag.c | 2 -- tests/interactive/test-scrolling.c | 1 - 5 files changed, 8 insertions(+), 18 deletions(-) diff --git a/clutter/clutter-drag-action.c b/clutter/clutter-drag-action.c index 90bb952..4ca104f 100644 --- a/clutter/clutter-drag-action.c +++ b/clutter/clutter-drag-action.c @@ -82,7 +82,6 @@ struct _ClutterDragActionPrivate gfloat press_x; gfloat press_y; ClutterModifierType press_state; - gint press_button; gfloat last_motion_x; gfloat last_motion_y; @@ -131,7 +130,6 @@ emit_drag_begin (ClutterDragAction *action, g_signal_emit (action, drag_signals[DRAG_BEGIN], 0, actor, priv->press_x, priv->press_y, - priv->press_button, priv->press_state); } @@ -212,7 +210,6 @@ emit_drag_end (ClutterDragAction *action, g_signal_emit (action, drag_signals[DRAG_END], 0, actor, priv->last_motion_x, priv->last_motion_y, - priv->press_button, clutter_event_get_state (event)); /* disconnect the capture */ @@ -277,11 +274,13 @@ on_button_press (ClutterActor *actor, if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (action))) return FALSE; + if (clutter_event_get_button (event) != 1) + return FALSE; + if (priv->stage == NULL) priv->stage = clutter_actor_get_stage (actor); clutter_event_get_coords (event, &priv->press_x, &priv->press_y); - priv->press_button = clutter_event_get_button (event); priv->press_state = clutter_event_get_state (event); priv->last_motion_x = priv->press_x; @@ -512,7 +511,6 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass) * @actor: the #ClutterActor attached to the action * @event_x: the X coordinate (in stage space) of the press event * @event_y: the Y coordinate (in stage space) of the press event - * @button: the button of the press event * @modifiers: the modifiers of the press event * * The ::drag-begin signal is emitted when the #ClutterDragAction @@ -529,12 +527,11 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterDragActionClass, drag_begin), NULL, NULL, - _clutter_marshal_VOID__OBJECT_FLOAT_FLOAT_INT_FLAGS, - G_TYPE_NONE, 5, + _clutter_marshal_VOID__OBJECT_FLOAT_FLOAT_FLAGS, + G_TYPE_NONE, 4, CLUTTER_TYPE_ACTOR, G_TYPE_FLOAT, G_TYPE_FLOAT, - G_TYPE_INT, CLUTTER_TYPE_MODIFIER_TYPE); /** @@ -584,7 +581,6 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass) * @actor: the #ClutterActor attached to the action * @event_x: the X coordinate (in stage space) of the release event * @event_y: the Y coordinate (in stage space) of the release event - * @button: the button of the release event * @modifiers: the modifiers of the release event * * The ::drag-end signal is emitted at the end of the dragging, @@ -601,12 +597,11 @@ clutter_drag_action_class_init (ClutterDragActionClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ClutterDragActionClass, drag_end), NULL, NULL, - _clutter_marshal_VOID__OBJECT_FLOAT_FLOAT_INT_FLAGS, - G_TYPE_NONE, 5, + _clutter_marshal_VOID__OBJECT_FLOAT_FLOAT_FLAGS, + G_TYPE_NONE, 4, CLUTTER_TYPE_ACTOR, G_TYPE_FLOAT, G_TYPE_FLOAT, - G_TYPE_INT, CLUTTER_TYPE_MODIFIER_TYPE); } diff --git a/clutter/clutter-drag-action.h b/clutter/clutter-drag-action.h index aa78b6d..aa7c15c 100644 --- a/clutter/clutter-drag-action.h +++ b/clutter/clutter-drag-action.h @@ -100,7 +100,6 @@ struct _ClutterDragActionClass ClutterActor *actor, gfloat event_x, gfloat event_y, - gint button, ClutterModifierType modifiers); void (* drag_motion) (ClutterDragAction *action, ClutterActor *actor, @@ -110,7 +109,6 @@ struct _ClutterDragActionClass ClutterActor *actor, gfloat event_x, gfloat event_y, - gint button, ClutterModifierType modifiers); /*< private >*/ diff --git a/clutter/clutter-marshal.list b/clutter/clutter-marshal.list index 0ad5742..91c4c4f 100644 --- a/clutter/clutter-marshal.list +++ b/clutter/clutter-marshal.list @@ -11,7 +11,7 @@ VOID:FLOAT,FLOAT VOID:INT,INT,INT,INT VOID:OBJECT VOID:OBJECT,FLOAT,FLOAT -VOID:OBJECT,FLOAT,FLOAT,INT,FLAGS +VOID:OBJECT,FLOAT,FLOAT,FLAGS VOID:OBJECT,OBJECT,PARAM VOID:OBJECT,POINTER VOID:POINTER diff --git a/tests/interactive/test-drag.c b/tests/interactive/test-drag.c index 7fda1a5..3d29226 100644 --- a/tests/interactive/test-drag.c +++ b/tests/interactive/test-drag.c @@ -29,7 +29,6 @@ on_drag_begin (ClutterDragAction *action, ClutterActor *actor, gfloat event_x, gfloat event_y, - gint button, ClutterModifierType modifiers) { gboolean is_copy = (modifiers & CLUTTER_SHIFT_MASK) ? TRUE : FALSE; @@ -65,7 +64,6 @@ on_drag_end (ClutterDragAction *action, ClutterActor *actor, gfloat event_x, gfloat event_y, - gint button, ClutterModifierType modifiers) { ClutterActor *drag_handle; diff --git a/tests/interactive/test-scrolling.c b/tests/interactive/test-scrolling.c index b550c4a..da48ddc 100644 --- a/tests/interactive/test-scrolling.c +++ b/tests/interactive/test-scrolling.c @@ -25,7 +25,6 @@ on_drag_end (ClutterDragAction *action, ClutterActor *actor, gfloat event_x, gfloat event_y, - guint button, ClutterModifierType modifiers) { gfloat viewport_x = clutter_actor_get_x (viewport); -- 2.7.4