diff options
| author | Elijah Newren <newren@gmail.com> | 2005-11-17 00:25:22 +0000 |
|---|---|---|
| committer | Elijah Newren <newren@src.gnome.org> | 2005-11-17 00:25:22 +0000 |
| commit | 1ab66784ec08ac8358d1dce5fd2b74111ef35918 (patch) | |
| tree | f72cb9bd7330f10a5f751f2505a552f445ae8d0c | |
| parent | 9c4436733e2cbdfbed889bc8b3f0e935443c6fd7 (diff) | |
| download | metacity-1ab66784ec08ac8358d1dce5fd2b74111ef35918.tar.gz | |
special case DOCK and DESKTOP windows out of the 2005-11-13 patch
2005-11-16 Elijah Newren <newren@gmail.com>
* src/window.c (meta_window_show_menu): special case DOCK and
DESKTOP windows out of the 2005-11-13 patch
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/window.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2005-11-16 Elijah Newren <newren@gmail.com> + * src/window.c (meta_window_show_menu): special case DOCK and + DESKTOP windows out of the 2005-11-13 patch + +2005-11-16 Elijah Newren <newren@gmail.com> + * src/boxes.c (get_disjoint_strut_list_in_region): handle the case where one strut completely overlaps the other. Patch from Ray Strode. diff --git a/src/window.c b/src/window.c index 7052a0b7..e534251b 100644 --- a/src/window.c +++ b/src/window.c @@ -6199,7 +6199,9 @@ meta_window_show_menu (MetaWindow *window, ops |= (META_MENU_OP_DELETE | META_MENU_OP_MINIMIZE | META_MENU_OP_MOVE | META_MENU_OP_RESIZE); - if (!meta_window_titlebar_is_onscreen (window)) + if (!meta_window_titlebar_is_onscreen (window) && + window->type != META_WINDOW_DOCK && + window->type != META_WINDOW_DESKTOP) ops |= META_MENU_OP_RECOVER; n_workspaces = meta_screen_get_n_workspaces (window->screen); |