Skip to content

WindowSwitcher: correctly handle multiple keybind modifiers #2807

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

Open
lenemter wants to merge 2 commits into
base: main
Choose a base branch
from
+3 −14
Open

WindowSwitcher: correctly handle multiple keybind modifiers #2807

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29a31fa
WindowSwitcher: correctly handle multiple keybind modifiers
lenemter Apr 2, 2026
3d9a4f0
Merge branch 'main' into lenemter/windowswitcher-handle-multiple-modi…
zeebok Apr 28, 2026
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
17 changes: 3 additions & 14 deletions src/Widgets/WindowSwitcher/WindowSwitcher.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class Gala.WindowSwitcher : AbstractSwitcher, GestureTarget, RootTarget {
public bool opened { get; private set; default = false; }

private GestureController gesture_controller;
private int modifier_mask;
private Clutter.ModifierType modifier_mask;
private Gala.ModalProxy? modal_proxy;
private int previous_icon_index = 0;

Expand Down Expand Up @@ -109,21 +109,10 @@ public class Gala.WindowSwitcher : AbstractSwitcher, GestureTarget, RootTarget {
return;
}

var workspace = display.get_workspace_manager ().get_active_workspace ();

// copied from gnome-shell, finds the primary modifier in the mask
var mask = binding.get_mask ();
if (mask == 0) {
modifier_mask = 0;
} else {
modifier_mask = 1;
while (mask > 1) {
mask >>= 1;
modifier_mask <<= 1;
}
}
modifier_mask = binding.get_modifiers ();

if (!opened) {
unowned var workspace = display.get_workspace_manager ().get_active_workspace ();
bool windows_exist;
if (binding.get_name ().has_prefix ("switch-group")) {
windows_exist = collect_current_windows (display, workspace);
Expand Down