brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellButtonBox: Use default handlers, not self-connections

Browse Source 
There's seldom a good justification for connecting to signals on
yourself rather than using the default handler slots in the class.

But in particular using the default handler slots means that
an application can connect to ::button-press-event and get in
before the default handling, to implement a button that does
something on press.

http://bugzilla.gnome.org/show_bug.cgi?id=593503
This commit is contained in:
Owen W. Taylor
2009-08-29 12:31:15 -04:00
parent 45c600cd25
commit 0e3cea41e0
1 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/shell-button-box.c
View File

@ -79,13 +79,14 @@ shell_button_box_contains (ShellButtonBox *box,
} }
static gboolean static gboolean
shell_button_box_on_enter (ShellButtonBox *box, shell_button_box_enter_event (ClutterActor *actor,
ClutterEvent *event, ClutterCrossingEvent *event)
gpointer user_data)
{ {
if (shell_button_box_contains (box, event->crossing.related)) ShellButtonBox *box = SHELL_BUTTON_BOX (actor);
if (shell_button_box_contains (box, event->related))
return TRUE; return TRUE;
if (!shell_button_box_contains (box, clutter_event_get_source (event))) if (!shell_button_box_contains (box, event->source))
return TRUE; return TRUE;
set_hover (box, TRUE); set_hover (box, TRUE);
@ -96,11 +97,12 @@ shell_button_box_on_enter (ShellButtonBox *box,
} }
static gboolean static gboolean
shell_button_box_on_leave (ShellButtonBox *box, shell_button_box_leave_event (ClutterActor *actor,
ClutterEvent *event, ClutterCrossingEvent *event)
gpointer user_data)
{ {
if (shell_button_box_contains (box, event->crossing.related)) ShellButtonBox *box = SHELL_BUTTON_BOX (actor);
if (shell_button_box_contains (box, event->related))
return TRUE; return TRUE;
set_hover (box, FALSE); set_hover (box, FALSE);
@ -110,17 +112,15 @@ shell_button_box_on_leave (ShellButtonBox *box,
} }
static gboolean static gboolean
shell_button_box_on_press (ShellButtonBox *box, shell_button_box_button_press_event (ClutterActor *actor,
ClutterEvent *event, ClutterButtonEvent *event)
gpointer user_data)
{ {
ClutterActor *source; ShellButtonBox *box = SHELL_BUTTON_BOX (actor);
if (box->priv->held) if (box->priv->held)
return TRUE; return TRUE;
source = clutter_event_get_source (event); if (!shell_button_box_contains (box, event->source))
if (!shell_button_box_contains (box, source))
return FALSE; return FALSE;
box->priv->held = TRUE; box->priv->held = TRUE;
@ -132,21 +132,18 @@ shell_button_box_on_press (ShellButtonBox *box,
} }
static gboolean static gboolean
shell_button_box_on_release (ShellButtonBox *box, shell_button_box_button_release_event (ClutterActor *actor,
ClutterEvent *event, ClutterButtonEvent *event)
gpointer user_data)
{ {
ClutterActor *source; ShellButtonBox *box = SHELL_BUTTON_BOX (actor);
if (!box->priv->held) if (!box->priv->held)
return TRUE; return TRUE;
source = clutter_event_get_source (event);
box->priv->held = FALSE; box->priv->held = FALSE;
clutter_ungrab_pointer (); clutter_ungrab_pointer ();
if (!shell_button_box_contains (box, source)) if (!shell_button_box_contains (box, event->source))
return FALSE; return FALSE;
set_pressed (box, FALSE); set_pressed (box, FALSE);
@ -204,10 +201,16 @@ static void
shell_button_box_class_init (ShellButtonBoxClass *klass) shell_button_box_class_init (ShellButtonBoxClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
gobject_class->get_property = shell_button_box_get_property; gobject_class->get_property = shell_button_box_get_property;
gobject_class->set_property = shell_button_box_set_property; gobject_class->set_property = shell_button_box_set_property;
actor_class->enter_event = shell_button_box_enter_event;
actor_class->leave_event = shell_button_box_leave_event;
actor_class->button_press_event = shell_button_box_button_press_event;
actor_class->button_release_event = shell_button_box_button_release_event;
/** /**
* ShellButtonBox::activate * ShellButtonBox::activate
* @box: The #ShellButtonBox * @box: The #ShellButtonBox
@ -275,9 +278,4 @@ shell_button_box_init (ShellButtonBox *self)
{ {
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, SHELL_TYPE_BUTTON_BOX, self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, SHELL_TYPE_BUTTON_BOX,
ShellButtonBoxPrivate); ShellButtonBoxPrivate);
g_signal_connect (G_OBJECT (self), "enter-event", G_CALLBACK(shell_button_box_on_enter), NULL);
g_signal_connect (G_OBJECT (self), "leave-event", G_CALLBACK(shell_button_box_on_leave), NULL);
g_signal_connect (G_OBJECT (self), "button-press-event", G_CALLBACK(shell_button_box_on_press), NULL);
g_signal_connect (G_OBJECT (self), "button-release-event", G_CALLBACK(shell_button_box_on_release), NULL);
} }