Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix switch-windows-all hotkey #753

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix switch-windows-all hotkey #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/core/keybindings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2106,8 +2106,6 @@ process_tab_grab (MetaDisplay *display,
target_window->desc);
display->mouse_mode = FALSE;
meta_window_activate (target_window, event->xkey.time);
if (!target_window->on_all_workspaces)
meta_workspace_activate (target_window->workspace, event->xkey.time);

meta_topic (META_DEBUG_KEYBINDINGS,
"Ending grab early so we can focus the target window\n");
Expand Down Expand Up @@ -3068,8 +3066,6 @@ do_choose_window (MetaDisplay *display,
initial_selection->desc);
display->mouse_mode = FALSE;
meta_window_activate (initial_selection, event->xkey.time);
if (!initial_selection->on_all_workspaces)
meta_workspace_activate (initial_selection->workspace, event->xkey.time);
}
else if (meta_display_begin_grab_op (display,
screen,
Expand Down Expand Up @@ -3099,8 +3095,6 @@ do_choose_window (MetaDisplay *display,
meta_display_end_grab_op (display, event->xkey.time);
display->mouse_mode = FALSE;
meta_window_activate (initial_selection, event->xkey.time);
if (!initial_selection->on_all_workspaces)
meta_workspace_activate (initial_selection->workspace, event->xkey.time);
}
else
{
Expand Down
9 changes: 8 additions & 1 deletion src/core/window.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3186,6 +3186,10 @@ window_activate (MetaWindow *window,
the source window. */
meta_window_change_workspace (window, workspace);
}
else
{
meta_workspace_activate_with_focus(workspace, window, timestamp);
}

if (window->shaded)
meta_window_unshade (window, timestamp);
Expand All @@ -3210,11 +3214,14 @@ void
meta_window_activate (MetaWindow *window,
guint32 timestamp)
{
MetaWorkspace *workspace;

workspace = window->on_all_workspaces ? NULL : window->workspace;
/* We're not really a pager, but the behavior we want is the same as if
* we were such. If we change the pager behavior later, we could revisit
* this and just add extra flags to window_activate.
*/
window_activate (window, timestamp, META_CLIENT_TYPE_PAGER, NULL);
window_activate (window, timestamp, META_CLIENT_TYPE_PAGER, workspace);
}

void
Expand Down