mirror of
https://github.com/brl/mutter.git
synced 2024-11-21 23:50:41 -05:00
Change wording of menu to "Always on Current Workspace" from "Put on All
2005-01-28 Elijah Newren <newren@gmail.com> * src/menu.c: Change wording of menu to "Always on Current Workspace" from "Put on All Workspaces", remove a quick-key conflict between "On _Top" and "Only on _This Workspace" by switching the latter to "_Only on This Workspace" * src/window.c: Remove a comment that is no longer necessary (since bug 87531 has been fixed)
This commit is contained in:
parent
cabf4fc359
commit
7d0ef20a9c
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
2005-01-28 Elijah Newren <newren@gmail.com>
|
||||
|
||||
* src/menu.c: Change wording of menu to "Always on Current
|
||||
Workspace" from "Put on All Workspaces", remove a quick-key
|
||||
conflict between "On _Top" and "Only on _This Workspace" by
|
||||
switching the latter to "_Only on This Workspace"
|
||||
|
||||
* src/window.c: Remove a comment that is no longer necessary
|
||||
(since bug 87531 has been fixed)
|
||||
|
||||
2005-01-28 Elijah Newren <newren@gmail.com>
|
||||
|
||||
Take into account the appropriate list of windows when placing a
|
||||
|
@ -63,8 +63,8 @@ static MenuItem menuitems[] = {
|
||||
{ 0, NULL, FALSE, NULL }, /* separator */
|
||||
{ META_MENU_OP_DELETE, METACITY_STOCK_DELETE, FALSE, N_("_Close") },
|
||||
{ META_MENU_OP_WORKSPACES, NULL, FALSE, NULL }, /* separator */
|
||||
{ META_MENU_OP_STICK, NULL, FALSE, N_("Put on _All Workspaces") },
|
||||
{ META_MENU_OP_UNSTICK, NULL, FALSE, N_("Only on _This Workspace") },
|
||||
{ META_MENU_OP_STICK, NULL, FALSE, N_("_Always on Current Workspace") },
|
||||
{ META_MENU_OP_UNSTICK, NULL, FALSE, N_("_Only on This Workspace") },
|
||||
{ META_MENU_OP_MOVE_LEFT, NULL, FALSE, N_("Move to Workspace _Left") },
|
||||
{ META_MENU_OP_MOVE_RIGHT, NULL, FALSE, N_("Move to Workspace R_ight") },
|
||||
{ META_MENU_OP_MOVE_UP, NULL, FALSE, N_("Move to Workspace _Up") },
|
||||
|
@ -1215,9 +1215,6 @@ meta_window_showing_on_its_workspace (MetaWindow *window)
|
||||
&is_desktop_or_dock);
|
||||
|
||||
if (window->on_all_workspaces)
|
||||
/* Until the behavior in bug 87531 is implemented, this will be
|
||||
* just a hack that only sort of works.
|
||||
*/
|
||||
workspace_of_window = window->screen->active_workspace;
|
||||
else if (window->workspace)
|
||||
workspace_of_window = window->workspace;
|
||||
|
Loading…
Reference in New Issue
Block a user