isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-28 22:23:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move "On Top" option in menu. Fix #382962.

Browse Source 
2006-12-27  Bruno Boaventura  <brunoboaventura@gmail.com>

        Move "On Top" option in menu. Fix #382962.

        * src/common.h, src/core.c: Remove META_MENU_OP_UNABOVE.
        * src/menu.c: remove unabove menu item and put above item
        next "Always on Visible Viewport".
        * src/window.c: remove handles of META_MENU_OP_UNABOVE.
This commit is contained in:
Bruno Boaventura 2006-12-27 15:51:49 +00:00 committed by Bruno Boaventura de Oliveira Lacerda
parent 5eabc7c781
commit 5ca9f43752
5 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2006-12-27 Bruno Boaventura <brunoboaventura@gmail.com>
Move "On Top" option in menu. Fix #382962.
* src/common.h, src/core.c: Remove META_MENU_OP_UNABOVE.
* src/menu.c: remove unabove menu item and put above item
next "Always on Visible Viewport".
* src/window.c: remove handles of META_MENU_OP_UNABOVE.
2006-12-21 Thomas Thurman <thomas@thurman.org.uk> 2006-12-21 Thomas Thurman <thomas@thurman.org.uk>
* src/compositor.c: Disabled bling for now; added function for * src/compositor.c: Disabled bling for now; added function for

11
src/common.h
View File

@ -64,12 +64,11 @@ typedef enum
META_MENU_OP_MOVE = 1 << 9, META_MENU_OP_MOVE = 1 << 9,
META_MENU_OP_RESIZE = 1 << 10, META_MENU_OP_RESIZE = 1 << 10,
META_MENU_OP_ABOVE = 1 << 11, META_MENU_OP_ABOVE = 1 << 11,
META_MENU_OP_UNABOVE = 1 << 12, META_MENU_OP_MOVE_LEFT = 1 << 12,
META_MENU_OP_MOVE_LEFT = 1 << 13, META_MENU_OP_MOVE_RIGHT = 1 << 13,
META_MENU_OP_MOVE_RIGHT = 1 << 14, META_MENU_OP_MOVE_UP = 1 << 14,
META_MENU_OP_MOVE_UP = 1 << 15, META_MENU_OP_MOVE_DOWN = 1 << 15,
META_MENU_OP_MOVE_DOWN = 1 << 16, META_MENU_OP_RECOVER = 1 << 16
META_MENU_OP_RECOVER = 1 << 17
} MetaMenuOp; } MetaMenuOp;
typedef struct _MetaWindowMenu MetaWindowMenu; typedef struct _MetaWindowMenu MetaWindowMenu;

1
src/core.c
View File

@ -531,7 +531,6 @@ meta_core_get_menu_accelerator (MetaMenuOp menu_op,
name = META_KEYBINDING_TOGGLE_STICKY; name = META_KEYBINDING_TOGGLE_STICKY;
break; break;
case META_MENU_OP_ABOVE: case META_MENU_OP_ABOVE:
case META_MENU_OP_UNABOVE:
name = META_KEYBINDING_TOGGLE_ABOVE; name = META_KEYBINDING_TOGGLE_ABOVE;
break; break;
case META_MENU_OP_WORKSPACES: case META_MENU_OP_WORKSPACES:

16
src/menu.c
View File

@ -75,10 +75,6 @@ static MenuItem menuitems[] = {
/* Translators: Translate this string the same way as you do in libwnck! */ /* Translators: Translate this string the same way as you do in libwnck! */
{ META_MENU_OP_UNSHADE, MENU_ITEM_NORMAL, NULL, FALSE, N_("_Unroll") }, { META_MENU_OP_UNSHADE, MENU_ITEM_NORMAL, NULL, FALSE, N_("_Unroll") },
/* Translators: Translate this string the same way as you do in libwnck! */ /* Translators: Translate this string the same way as you do in libwnck! */
{ META_MENU_OP_ABOVE, MENU_ITEM_CHECKBOX, NULL, FALSE, N_("On _Top") },
/* Translators: Translate this string the same way as you do in libwnck! */
{ META_MENU_OP_UNABOVE, MENU_ITEM_CHECKBOX, NULL, TRUE, N_("On _Top") },
/* Translators: Translate this string the same way as you do in libwnck! */
{ META_MENU_OP_MOVE, MENU_ITEM_NORMAL, NULL, FALSE, N_("_Move") }, { META_MENU_OP_MOVE, MENU_ITEM_NORMAL, NULL, FALSE, N_("_Move") },
/* Translators: Translate this string the same way as you do in libwnck! */ /* Translators: Translate this string the same way as you do in libwnck! */
{ META_MENU_OP_RESIZE, MENU_ITEM_NORMAL, NULL, FALSE, N_("_Resize") }, { META_MENU_OP_RESIZE, MENU_ITEM_NORMAL, NULL, FALSE, N_("_Resize") },
@ -89,6 +85,8 @@ static MenuItem menuitems[] = {
{ META_MENU_OP_DELETE, MENU_ITEM_IMAGE, METACITY_STOCK_DELETE, FALSE, N_("_Close") }, { META_MENU_OP_DELETE, MENU_ITEM_IMAGE, METACITY_STOCK_DELETE, FALSE, N_("_Close") },
{ META_MENU_OP_WORKSPACES, MENU_ITEM_SEPARATOR, NULL, FALSE, NULL }, /* separator */ { META_MENU_OP_WORKSPACES, MENU_ITEM_SEPARATOR, NULL, FALSE, NULL }, /* separator */
/* Translators: Translate this string the same way as you do in libwnck! */ /* Translators: Translate this string the same way as you do in libwnck! */
{ META_MENU_OP_ABOVE, MENU_ITEM_CHECKBOX, NULL, FALSE, N_("Always on _Top") },
/* Translators: Translate this string the same way as you do in libwnck! */
{ META_MENU_OP_STICK, MENU_ITEM_CHECKBOX, NULL, FALSE, N_("_Always on Visible Workspace") }, { META_MENU_OP_STICK, MENU_ITEM_CHECKBOX, NULL, FALSE, N_("_Always on Visible Workspace") },
/* Translators: Translate this string the same way as you do in libwnck! */ /* Translators: Translate this string the same way as you do in libwnck! */
{ META_MENU_OP_UNSTICK, MENU_ITEM_CHECKBOX, NULL, FALSE, N_("_Only on This Workspace") }, { META_MENU_OP_UNSTICK, MENU_ITEM_CHECKBOX, NULL, FALSE, N_("_Only on This Workspace") },
@ -346,7 +344,9 @@ meta_window_menu_new (MetaFrames *frames,
mi = menu_item_new (&menuitem, -1); mi = menu_item_new (&menuitem, -1);
if (menuitem.op == META_MENU_OP_STICK || menuitem.op == META_MENU_OP_UNSTICK) if ((menuitem.op == META_MENU_OP_STICK) ||
(menuitem.op == META_MENU_OP_UNSTICK) ||
(menuitem.op == META_MENU_OP_ABOVE))
{ {
Display *xdisplay; Display *xdisplay;
MetaDisplay *display; MetaDisplay *display;
@ -360,8 +360,12 @@ meta_window_menu_new (MetaFrames *frames,
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), window->on_all_workspaces); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), window->on_all_workspaces);
else else
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), !window->on_all_workspaces); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), !window->on_all_workspaces);
if (menuitem.op == META_MENU_OP_ABOVE)
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), window->wm_state_above);
} }
if (menuitem.type != MENU_ITEM_SEPARATOR) if (menuitem.type != MENU_ITEM_SEPARATOR)
{ {
meta_core_get_menu_accelerator (menuitems[i].op, -1, meta_core_get_menu_accelerator (menuitems[i].op, -1,

20
src/window.c
View File

@ -6239,11 +6239,10 @@ menu_callback (MetaWindowMenu *menu,
break; break;
case META_MENU_OP_ABOVE: case META_MENU_OP_ABOVE:
meta_window_make_above (window); if (window->wm_state_above == FALSE)
break; meta_window_make_above (window);
else
case META_MENU_OP_UNABOVE: meta_window_unmake_above (window);
meta_window_unmake_above (window);
break; break;
case META_MENU_OP_MOVE: case META_MENU_OP_MOVE:
@ -6366,13 +6365,10 @@ meta_window_show_menu (MetaWindow *window,
ops |= META_MENU_OP_SHADE; ops |= META_MENU_OP_SHADE;
#endif #endif
ops |= META_MENU_OP_UNSTICK; ops |= META_MENU_OP_UNSTICK;
ops |= META_MENU_OP_STICK; ops |= META_MENU_OP_STICK;
if (window->wm_state_above) ops |= META_MENU_OP_ABOVE;
ops |= META_MENU_OP_UNABOVE;
else
ops |= META_MENU_OP_ABOVE;
if (!window->has_maximize_func) if (!window->has_maximize_func)
insensitive |= META_MENU_OP_UNMAXIMIZE | META_MENU_OP_MAXIMIZE; insensitive |= META_MENU_OP_UNMAXIMIZE | META_MENU_OP_MAXIMIZE;
@ -6398,7 +6394,7 @@ meta_window_show_menu (MetaWindow *window,
if ((window->type == META_WINDOW_DESKTOP) || if ((window->type == META_WINDOW_DESKTOP) ||
(window->type == META_WINDOW_DOCK) || (window->type == META_WINDOW_DOCK) ||
(window->type == META_WINDOW_SPLASHSCREEN)) (window->type == META_WINDOW_SPLASHSCREEN))
insensitive |= META_MENU_OP_ABOVE | META_MENU_OP_UNABOVE; insensitive |= META_MENU_OP_ABOVE;
/* If all operations are disabled, just quit without showing the menu. /* If all operations are disabled, just quit without showing the menu.
* This is the case, for example, with META_WINDOW_DESKTOP windows. * This is the case, for example, with META_WINDOW_DESKTOP windows.