diff options
| author | Elijah Newren <newren gmail com> | 2007-04-16 04:48:14 +0000 |
|---|---|---|
| committer | Elijah Newren <newren@src.gnome.org> | 2007-04-16 04:48:14 +0000 |
| commit | 6de7271ab6aed15f349f61e7d3a5a46d0734a201 (patch) | |
| tree | 809884f236996aa311ddfb7d221c6b21c852fa70 /src/window.c | |
| parent | 6fa4dee13e4aa39fdeed55a49eee2fcd01ba05db (diff) | |
| download | metacity-6de7271ab6aed15f349f61e7d3a5a46d0734a201.tar.gz | |
Remove incorrect usage of window.h from menu.c. See #426791 & #382962.
2007-04-15 Elijah Newren <newren gmail com>
Remove incorrect usage of window.h from menu.c. See #426791 &
#382962.
* src/menu.c (enum MetaMenuItemType, variable menuitems,
meta_menu_item_new):
cleanup: add a MENU_ITEM_RADIOBUTTON for the sticky stuff
* src/menu.c (variable menuitems):
* src/core.c (meta_core_get_menu_accelerator):
* src/window.c (menu_callback, meta_window_show_menu):
* src/common.h (enum MetaMenuOp):
reinstate META_MENU_OP_UNABOVE
* src/menu.c (meta_window_menu_new):
remove hacks (using inappropriate data) for STICK/UNSTICK/ABOVE
and clean it up while just setting STICK/UNSTICK activeness as
necessary
* src/menu.[ch] (meta_window_menu_new):
* src/ui.[ch] (meta_ui_window_menu_new):
make the active_workspace parameter an unsigned long
2007-04-15 Bruno Boaventura <brunobol@gnome.org>
* src/menu.c (meta_window_menu_new): don't show the current
workspace as a possible workspace to switch to. Fixes #426791.
svn path=/trunk/; revision=3196
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index 6b81d399..59267c80 100644 --- a/src/window.c +++ b/src/window.c @@ -6408,6 +6408,7 @@ menu_callback (MetaWindowMenu *menu, break; case META_MENU_OP_ABOVE: + case META_MENU_OP_UNABOVE: if (window->wm_state_above == FALSE) meta_window_make_above (window); else @@ -6537,7 +6538,10 @@ meta_window_show_menu (MetaWindow *window, ops |= META_MENU_OP_UNSTICK; ops |= META_MENU_OP_STICK; - ops |= META_MENU_OP_ABOVE; + if (window->wm_state_above) + ops |= META_MENU_OP_UNABOVE; + else + ops |= META_MENU_OP_ABOVE; if (!window->has_maximize_func) insensitive |= META_MENU_OP_UNMAXIMIZE | META_MENU_OP_MAXIMIZE; @@ -6563,7 +6567,7 @@ meta_window_show_menu (MetaWindow *window, if ((window->type == META_WINDOW_DESKTOP) || (window->type == META_WINDOW_DOCK) || (window->type == META_WINDOW_SPLASHSCREEN)) - insensitive |= META_MENU_OP_ABOVE; + insensitive |= META_MENU_OP_ABOVE | META_MENU_OP_UNABOVE; /* If all operations are disabled, just quit without showing the menu. * This is the case, for example, with META_WINDOW_DESKTOP windows. |