isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't show left/right/up/down if a window is sticky. Make "On Top"

Browse Source 
2004-01-17  Rob Adams  <readams@readams.net>

	* src/window.c (meta_window_show_menu): Don't show
	left/right/up/down if a window is sticky.  Make "On Top"
	insensitive for docks, splash screens, and desktops since it has
	no effect anyway.
This commit is contained in:
Rob Adams 2004-01-17 18:57:26 +00:00 committed by Rob Adams
parent 6770329e69
commit 40a710dad0
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2004-01-17 Rob Adams <readams@readams.net>
* src/window.c (meta_window_show_menu): Don't show
left/right/up/down if a window is sticky. Make "On Top"
insensitive for docks, splash screens, and desktops since it has
no effect anyway.
2004-01-10 Rob Adams <readams@readams.net> 2004-01-10 Rob Adams <readams@readams.net>
* src/metacity.schemas.in: update default * src/metacity.schemas.in: update default

28
src/window.c
View File

@ -5711,15 +5711,18 @@ meta_window_show_menu (MetaWindow *window,
meta_workspace_index ( window->screen->active_workspace), meta_workspace_index ( window->screen->active_workspace),
&layout); &layout);
if (layout.current_col > 0) if (!window->on_all_workspaces)
ops |= META_MENU_OP_MOVE_LEFT; {
if (layout.current_col < layout.cols - 1) if (layout.current_col > 0)
ops |= META_MENU_OP_MOVE_RIGHT; ops |= META_MENU_OP_MOVE_LEFT;
if (layout.current_row > 0) if (layout.current_col < layout.cols - 1)
ops |= META_MENU_OP_MOVE_UP; ops |= META_MENU_OP_MOVE_RIGHT;
if (layout.current_row < layout.rows - 1) if (layout.current_row > 0)
ops |= META_MENU_OP_MOVE_DOWN; ops |= META_MENU_OP_MOVE_UP;
if (layout.current_row < layout.rows - 1)
ops |= META_MENU_OP_MOVE_DOWN;
}
if (window->maximized) if (window->maximized)
ops |= META_MENU_OP_UNMAXIMIZE; ops |= META_MENU_OP_UNMAXIMIZE;
else else
@ -5736,7 +5739,7 @@ meta_window_show_menu (MetaWindow *window,
ops |= META_MENU_OP_UNSTICK; ops |= META_MENU_OP_UNSTICK;
else else
ops |= META_MENU_OP_STICK; ops |= META_MENU_OP_STICK;
if (window->wm_state_above) if (window->wm_state_above)
ops |= META_MENU_OP_UNABOVE; ops |= META_MENU_OP_UNABOVE;
else else
@ -5762,6 +5765,11 @@ meta_window_show_menu (MetaWindow *window,
if (window->always_sticky) if (window->always_sticky)
insensitive |= META_MENU_OP_UNSTICK | META_MENU_OP_WORKSPACES; insensitive |= META_MENU_OP_UNSTICK | META_MENU_OP_WORKSPACES;
if ((window->type == META_WINDOW_DESKTOP) ||
(window->type == META_WINDOW_DOCK) ||
(window->type == META_WINDOW_SPLASHSCREEN))
insensitive |= META_MENU_OP_ABOVE | META_MENU_OP_UNABOVE;
menu = menu =
meta_ui_window_menu_new (window->screen->ui, meta_ui_window_menu_new (window->screen->ui,