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

drag-action: Use per-stage motion event toggle

Browse Source 
Similar to what we did for the ClutterDeviceManager, use per-stage
granularity when toggling the motion event delivery while dragging.
This commit is contained in:
Emmanuele Bassi 2011-02-18 19:28:48 +00:00
parent cca2e5bc9c
commit a923375f0a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clutter/clutter-drag-action.c
View File

@ -67,10 +67,11 @@
#include "clutter-enum-types.h" #include "clutter-enum-types.h"
#include "clutter-marshal.h" #include "clutter-marshal.h"
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-stage-private.h"
struct _ClutterDragActionPrivate struct _ClutterDragActionPrivate
{ {
ClutterActor *stage; ClutterStage *stage;
gfloat x_drag_threshold; gfloat x_drag_threshold;
gfloat y_drag_threshold; gfloat y_drag_threshold;
@ -134,7 +135,8 @@ emit_drag_begin (ClutterDragAction *action,
{ {
ClutterDragActionPrivate *priv = action->priv; ClutterDragActionPrivate *priv = action->priv;
clutter_set_motion_events_enabled (FALSE); if (priv->stage != NULL)
_clutter_stage_set_motion_events_enabled (priv->stage, FALSE);
g_signal_emit (action, drag_signals[DRAG_BEGIN], 0, g_signal_emit (action, drag_signals[DRAG_BEGIN], 0,
actor, actor,
@ -228,7 +230,8 @@ emit_drag_end (ClutterDragAction *action,
priv->capture_id = 0; priv->capture_id = 0;
} }
clutter_set_motion_events_enabled (priv->motion_events_enabled); _clutter_stage_set_motion_events_enabled (priv->stage,
priv->motion_events_enabled);
priv->in_drag = FALSE; priv->in_drag = FALSE;
} }
@ -295,7 +298,7 @@ on_button_press (ClutterActor *actor,
return FALSE; return FALSE;
if (priv->stage == NULL) if (priv->stage == NULL)
priv->stage = clutter_actor_get_stage (actor); priv->stage = CLUTTER_STAGE (clutter_actor_get_stage (actor));
clutter_event_get_coords (event, &priv->press_x, &priv->press_y); clutter_event_get_coords (event, &priv->press_x, &priv->press_y);
priv->press_state = clutter_event_get_state (event); priv->press_state = clutter_event_get_state (event);
@ -309,7 +312,8 @@ on_button_press (ClutterActor *actor,
&priv->transformed_press_x, &priv->transformed_press_x,
&priv->transformed_press_y); &priv->transformed_press_y);
priv->motion_events_enabled = clutter_get_motion_events_enabled (); priv->motion_events_enabled =
_clutter_stage_get_motion_events_enabled (priv->stage);
if (priv->x_drag_threshold == 0 || priv->y_drag_threshold == 0) if (priv->x_drag_threshold == 0 || priv->y_drag_threshold == 0)
emit_drag_begin (action, actor, event); emit_drag_begin (action, actor, event);