isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-23 01:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "swipe-action: Introduce new ::swipe signal"

Browse Source 
This reverts commit 3e671f9c1b542f6b843c28e80c174bfaa93bc2a5.

Pushed by mistake, sorry.
This commit is contained in:
Jasper St. Pierre 2012-11-30 18:20:41 -05:00
parent 3e671f9c1b
commit c5321da66c
3 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/clutter-marshal.list
View File

@ -4,7 +4,6 @@ BOOLEAN:OBJECT,BOOLEAN
BOOLEAN:OBJECT,BOXED,DOUBLE BOOLEAN:OBJECT,BOXED,DOUBLE
BOOLEAN:OBJECT,DOUBLE BOOLEAN:OBJECT,DOUBLE
BOOLEAN:OBJECT,ENUM BOOLEAN:OBJECT,ENUM
BOOLEAN:OBJECT,FLAGS
BOOLEAN:STRING,UINT,FLAGS BOOLEAN:STRING,UINT,FLAGS
BOOLEAN:OBJECT BOOLEAN:OBJECT
BOOLEAN:OBJECT,FLOAT,FLOAT BOOLEAN:OBJECT,FLOAT,FLOAT

33
clutter/clutter-swipe-action.c
View File

@ -59,7 +59,6 @@ struct _ClutterSwipeActionPrivate
enum enum
{ {
SWEPT, SWEPT,
SWIPE,
LAST_SIGNAL LAST_SIGNAL
}; };
@ -142,7 +141,6 @@ gesture_end (ClutterGestureAction *action,
gfloat press_x, press_y; gfloat press_x, press_y;
gfloat release_x, release_y; gfloat release_x, release_y;
ClutterSwipeDirection direction = 0; ClutterSwipeDirection direction = 0;
gboolean can_emit_swipe;
clutter_gesture_action_get_press_coords (action, clutter_gesture_action_get_press_coords (action,
0, 0,
@ -162,10 +160,6 @@ gesture_end (ClutterGestureAction *action,
else if (press_y - release_y > priv->threshold) else if (press_y - release_y > priv->threshold)
direction |= CLUTTER_SWIPE_DIRECTION_UP; direction |= CLUTTER_SWIPE_DIRECTION_UP;
/* XXX:2.0 remove */
g_signal_emit (action, swipe_signals[SWIPE], 0, actor, direction,
&can_emit_swipe);
if (can_emit_swipe)
g_signal_emit (action, swipe_signals[SWEPT], 0, actor, direction); g_signal_emit (action, swipe_signals[SWEPT], 0, actor, direction);
} }
@ -190,8 +184,6 @@ clutter_swipe_action_class_init (ClutterSwipeActionClass *klass)
* The ::swept signal is emitted when a swipe gesture is recognized on the * The ::swept signal is emitted when a swipe gesture is recognized on the
* attached actor. * attached actor.
* *
* Deprecated: 1.14: Use the ::swipe signal instead.
*
* Since: 1.8 * Since: 1.8
*/ */
swipe_signals[SWEPT] = swipe_signals[SWEPT] =
@ -204,31 +196,6 @@ clutter_swipe_action_class_init (ClutterSwipeActionClass *klass)
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
CLUTTER_TYPE_ACTOR, CLUTTER_TYPE_ACTOR,
CLUTTER_TYPE_SWIPE_DIRECTION); CLUTTER_TYPE_SWIPE_DIRECTION);
/**
* ClutterSwipeAction::swipe:
* @action: the #ClutterSwipeAction that emitted the signal
* @actor: the #ClutterActor attached to the @action
* @direction: the main direction of the swipe gesture
*
* The ::swipe signal is emitted when a swipe gesture is recognized on the
* attached actor.
*
* Return value: %TRUE if the pan should continue, and %FALSE if
* the pan should be cancelled.
*
* Since: 1.14
*/
swipe_signals[SWIPE] =
g_signal_new (I_("swipe"),
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterSwipeActionClass, swipe),
_clutter_boolean_continue_accumulator, NULL,
_clutter_marshal_BOOLEAN__OBJECT_FLAGS,
G_TYPE_BOOLEAN, 2,
CLUTTER_TYPE_ACTOR,
CLUTTER_TYPE_SWIPE_DIRECTION);
} }
static void static void

4
clutter/clutter-swipe-action.h
View File

@ -83,10 +83,6 @@ struct _ClutterSwipeActionClass
ClutterActor *actor, ClutterActor *actor,
ClutterSwipeDirection direction); ClutterSwipeDirection direction);
gboolean (* swipe) (ClutterSwipeAction *action,
ClutterActor *actor,
ClutterSwipeDirection direction);
/*< private >*/ /*< private >*/
void (* _clutter_swipe_action1) (void); void (* _clutter_swipe_action1) (void);
void (* _clutter_swipe_action2) (void); void (* _clutter_swipe_action2) (void);