sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swipe: enter into "recognized" state when there is a motion directionality

Browse Source 
This allows for checking the controller state as events are fed into it
without connecting to begin/end signals

Signed-off-by: Carlos Garnacho <carlos@lanedo.com>
Acked-by: Simon Schampijer <simon@laptop.org>
This commit is contained in:
Carlos Garnacho 2012-10-02 12:56:36 +02:00 committed by Simon Schampijer
parent c5fe8a26f6
commit 470d14a749
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/sugar3/event-controller/sugar-swipe-controller.c
View File

@ -46,6 +46,7 @@ struct _SugarSwipeControllerPriv
GdkDevice *device; GdkDevice *device;
GdkEventSequence *sequence; GdkEventSequence *sequence;
GArray *event_data; GArray *event_data;
guint swiping : 1;
guint swiped : 1; guint swiped : 1;
}; };
@ -83,6 +84,7 @@ _sugar_swipe_controller_clear_events (SugarSwipeController *controller)
priv->event_data->len > 0) priv->event_data->len > 0)
g_array_remove_range (priv->event_data, 0, priv->event_data->len); g_array_remove_range (priv->event_data, 0, priv->event_data->len);
priv->swiping = FALSE;
priv->swiped = FALSE; priv->swiped = FALSE;
} }
@ -164,18 +166,18 @@ _sugar_swipe_controller_get_direction (SugarEventData *from,
return FALSE; return FALSE;
} }
static void static gboolean
_sugar_swipe_controller_check_emit (SugarSwipeController *controller) _sugar_swipe_controller_get_event_direction (SugarSwipeController *controller,
SugarSwipeDirection *direction)
{ {
SugarSwipeControllerPriv *priv; SugarSwipeControllerPriv *priv;
SugarEventData *last, *check; SugarEventData *last, *check;
SugarSwipeDirection direction;
gint i; gint i;
priv = controller->_priv; priv = controller->_priv;
if (!priv->event_data || priv->event_data->len == 0) if (!priv->event_data || priv->event_data->len == 0)
return; return FALSE;
last = &g_array_index (priv->event_data, SugarEventData, last = &g_array_index (priv->event_data, SugarEventData,
priv->event_data->len - 1); priv->event_data->len - 1);
@ -188,11 +190,20 @@ _sugar_swipe_controller_check_emit (SugarSwipeController *controller)
break; break;
} }
if (_sugar_swipe_controller_get_direction (check, last, &direction)) return _sugar_swipe_controller_get_direction (check, last, direction);
}
static void
_sugar_swipe_controller_check_emit (SugarSwipeController *controller)
{
SugarSwipeControllerPriv *priv;
SugarSwipeDirection direction;
priv = controller->_priv;
if (_sugar_swipe_controller_get_event_direction (controller, &direction))
{ {
priv->swiped = TRUE; priv->swiped = TRUE;
g_signal_emit_by_name (G_OBJECT (controller), "began");
g_object_notify (G_OBJECT (controller), "state");
g_signal_emit (controller, signals[SWIPE_ENDED], 0, direction); g_signal_emit (controller, signals[SWIPE_ENDED], 0, direction);
g_signal_emit_by_name (G_OBJECT (controller), "ended"); g_signal_emit_by_name (G_OBJECT (controller), "ended");
} }
@ -204,6 +215,7 @@ sugar_swipe_controller_handle_event (SugarEventController *controller,
{ {
SugarSwipeControllerPriv *priv; SugarSwipeControllerPriv *priv;
SugarSwipeController *swipe; SugarSwipeController *swipe;
SugarSwipeDirection direction;
GdkEventSequence *sequence; GdkEventSequence *sequence;
gboolean handled = TRUE; gboolean handled = TRUE;
GdkDevice *device; GdkDevice *device;
@ -242,6 +254,13 @@ sugar_swipe_controller_handle_event (SugarEventController *controller,
break; break;
case GDK_TOUCH_UPDATE: case GDK_TOUCH_UPDATE:
_sugar_swipe_controller_store_event (swipe, event); _sugar_swipe_controller_store_event (swipe, event);
if (_sugar_swipe_controller_get_event_direction (swipe, &direction))
{
priv->swiping = TRUE;
g_signal_emit_by_name (G_OBJECT (controller), "began");
g_object_notify (G_OBJECT (controller), "state");
}
break; break;
default: default:
handled = FALSE; handled = FALSE;
@ -260,7 +279,7 @@ sugar_swipe_controller_get_state (SugarEventController *controller)
if (priv->device) if (priv->device)
{ {
if (priv->swiped) if (priv->swiped || priv->swiping)
return SUGAR_EVENT_CONTROLLER_STATE_RECOGNIZED; return SUGAR_EVENT_CONTROLLER_STATE_RECOGNIZED;
else if (priv->event_data->len > 0) else if (priv->event_data->len > 0)
return SUGAR_EVENT_CONTROLLER_STATE_COLLECTING; return SUGAR_EVENT_CONTROLLER_STATE_COLLECTING;