brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 184b8c6fa6.
This commit is contained in:
Jasper St. Pierre 2012-12-02 20:19:14 -05:00
parent 511e266a85
commit 45521b0417
3 changed files with 3 additions and 41 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,DOUBLE
BOOLEAN:OBJECT,ENUM
BOOLEAN:OBJECT,FLAGS
BOOLEAN:STRING,UINT,FLAGS
BOOLEAN:OBJECT
BOOLEAN:OBJECT,FLOAT,FLOAT

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

@ -59,7 +59,6 @@ struct _ClutterSwipeActionPrivate
enum
{
SWEPT,
SWIPE,
LAST_SIGNAL
};
@ -142,7 +141,6 @@ gesture_end (ClutterGestureAction *action,
gfloat press_x, press_y;
gfloat release_x, release_y;
ClutterSwipeDirection direction = 0;
gboolean can_emit_swipe;
clutter_gesture_action_get_press_coords (action,
0,
@ -162,11 +160,7 @@ gesture_end (ClutterGestureAction *action,
else if (press_y - release_y > priv->threshold)
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);
}
static void
@ -190,46 +184,18 @@ clutter_swipe_action_class_init (ClutterSwipeActionClass *klass)
* The ::swept signal is emitted when a swipe gesture is recognized on the
* attached actor.
*
* Deprecated: 1.14: Use the ::swipe signal instead.
*
* Since: 1.8
*/
swipe_signals[SWEPT] =
g_signal_new (I_("swept"),
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST |
G_SIGNAL_DEPRECATED,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ClutterSwipeActionClass, swept),
NULL, NULL,
_clutter_marshal_VOID__OBJECT_FLAGS,
G_TYPE_NONE, 2,
CLUTTER_TYPE_ACTOR,
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 swipe should continue, and %FALSE if
* the swipe 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

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

@ -83,10 +83,6 @@ struct _ClutterSwipeActionClass
ClutterActor *actor,
ClutterSwipeDirection direction);
gboolean (* swipe) (ClutterSwipeAction *action,
ClutterActor *actor,
ClutterSwipeDirection direction);
/*< private >*/
void (* _clutter_swipe_action1) (void);
void (* _clutter_swipe_action2) (void);
@ -94,6 +90,7 @@ struct _ClutterSwipeActionClass
void (* _clutter_swipe_action4) (void);
void (* _clutter_swipe_action5) (void);
void (* _clutter_swipe_action6) (void);
void (* _clutter_swipe_action7) (void);
};
GType clutter_swipe_action_get_type (void) G_GNUC_CONST;