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

Revert "[AppWell] Allow popup menu to be persistent, and support direct window selection"

Browse Source 
This reverts commit 6e31e59b57.
This commit is contained in:
Colin Walters
2009-09-11 18:58:30 -04:00
parent e52cb3c213
commit dfe16f4af6
5 changed files with 22 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/shell-menu.c
View File

@ -15,9 +15,6 @@ G_DEFINE_TYPE(ShellMenu, shell_menu, BIG_TYPE_BOX);
struct _ShellMenuPrivate {
gboolean have_grab;
gboolean released_on_source;
ClutterActor *source_actor;
ClutterActor *selected;
};
@ -34,10 +31,10 @@ enum
static guint shell_menu_signals [LAST_SIGNAL] = { 0 };
static gboolean
shell_menu_contains (ClutterContainer *container,
ClutterActor *actor)
shell_menu_contains (ShellMenu *box,
ClutterActor *actor)
{
while (actor != NULL && actor != (ClutterActor*)container)
while (actor != NULL && actor != (ClutterActor*)box)
{
actor = clutter_actor_get_parent (actor);
}
@ -76,7 +73,7 @@ shell_menu_enter_event (ClutterActor *actor,
{
ShellMenu *box = SHELL_MENU (actor);
if (!shell_menu_contains (CLUTTER_CONTAINER (box), event->source))
if (!shell_menu_contains (box, event->source))
return TRUE;
if (event->source == (ClutterActor*)box)
@ -110,21 +107,9 @@ shell_menu_button_release_event (ClutterActor *actor,
if (event->button != 1)
return FALSE;
if (box->priv->source_actor && !box->priv->released_on_source)
{
if (box->priv->source_actor == event->source ||
(CLUTTER_IS_CONTAINER (box->priv->source_actor) &&
shell_menu_contains (CLUTTER_CONTAINER (box->priv->source_actor), event->source)))
{
/* On the next release, we want to pop down the menu regardless */
box->priv->released_on_source = TRUE;
return TRUE;
}
}
shell_menu_popdown (box);
if (!shell_menu_contains (CLUTTER_CONTAINER (box), event->source))
if (!shell_menu_contains (box, event->source))
return FALSE;
if (box->priv->selected == NULL)
@ -141,7 +126,6 @@ shell_menu_popup (ShellMenu *box,
guint32 activate_time)
{
box->priv->have_grab = TRUE;
box->priv->released_on_source = FALSE;
clutter_grab_pointer (CLUTTER_ACTOR (box));
}
@ -154,45 +138,6 @@ shell_menu_popdown (ShellMenu *box)
g_signal_emit (G_OBJECT (box), shell_menu_signals[POPDOWN], 0);
}
static void
on_source_destroyed (ClutterActor *actor,
ShellMenu *box)
{
box->priv->source_actor = NULL;
}
/**
* shell_menu_set_persistent_source:
* @box:
* @source: Actor to use as menu origin
*
* This function changes the menu behavior on button release. Normally
* when the mouse is released anywhere, the menu "pops down"; when this
* function is called, if the mouse is released over the source actor,
* the menu stays.
*
* The given @source actor must be reactive for this function to work.
*/
void
shell_menu_set_persistent_source (ShellMenu *box,
ClutterActor *source)
{
if (box->priv->source_actor)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (box->priv->source_actor),
G_CALLBACK (on_source_destroyed),
box);
}
box->priv->source_actor = source;
if (box->priv->source_actor)
{
g_signal_connect (G_OBJECT (box->priv->source_actor),
"destroy",
G_CALLBACK (on_source_destroyed),
box);
}
}
/**
* shell_menu_append_separator:
* @box:

2
src/shell-menu.h
View File

@ -32,8 +32,6 @@ GType shell_menu_get_type (void) G_GNUC_CONST;
void shell_menu_popup (ShellMenu *behavior, guint button, guint32 activate_time);
void shell_menu_set_persistent_source (ShellMenu *behavior, ClutterActor *source);
void shell_menu_append_separator (ShellMenu *behavior, ClutterActor *separator, BigBoxPackFlags flags);
void shell_menu_popdown (ShellMenu *behavior);