Skip to content

Handle indicator cycling via Gtk.ShortcutController #711

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

Merged
danirabbit merged 1 commit into from
Aug 30, 2026
+31 −12
Merged

Handle indicator cycling via Gtk.ShortcutController #711

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
11 changes: 0 additions & 11 deletions src/PanelWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,6 @@ public class Wingpanel.PanelWindow : Gtk.Window {
child = box;
remove_css_class (Granite.STYLE_CLASS_BACKGROUND);

var cycle_action = new SimpleAction ("cycle", null);
cycle_action.activate.connect (() => panel.cycle (true));

var cycle_back_action = new SimpleAction ("cycle-back", null);
cycle_back_action.activate.connect (() => panel.cycle (false));

application.add_action (cycle_action);
application.add_action (cycle_back_action);
application.set_accels_for_action ("app.cycle", {"<Control>Tab"});
application.set_accels_for_action ("app.cycle-back", {"<Control><Shift>Tab"});

popover_manager.notify["indicator-open"].connect (() => {
if (!popover_manager.indicator_open) {
Services.BackgroundManager.get_default ().restore_window ();
Expand Down
32 changes: 31 additions & 1 deletion src/Widgets/Panel.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,36 @@ public class Wingpanel.Widgets.Panel : Granite.Bin {
current_scroll_delta = 0;
}
});

var cycle_action = new SimpleAction ("cycle", null);
cycle_action.activate.connect (() => cycle (true));

var cycle_back_action = new SimpleAction ("cycle-back", null);
cycle_back_action.activate.connect (() => cycle (false));

var action_group = new SimpleActionGroup ();
action_group.add_action (cycle_action);
action_group.add_action (cycle_back_action);

insert_action_group ("panel", action_group);

var cycle_shortcut = new Gtk.Shortcut (
new Gtk.KeyvalTrigger (Gdk.Key.Tab, CONTROL_MASK),
new Gtk.NamedAction ("panel.cycle")
);
var cycle_back_shortcut = new Gtk.Shortcut (
new Gtk.KeyvalTrigger (Gdk.Key.Tab, CONTROL_MASK | SHIFT_MASK),
new Gtk.NamedAction ("panel.cycle-back")
);

var shortcut_controller = new Gtk.ShortcutController () {
propagation_phase = CAPTURE,
propagation_limit = NONE // we need to listen to popover events
};
shortcut_controller.add_shortcut (cycle_shortcut);
shortcut_controller.add_shortcut (cycle_back_shortcut);

add_controller (shortcut_controller);
}

private void begin_drag (double x, double y) {
Expand All @@ -106,7 +136,7 @@ public class Wingpanel.Widgets.Panel : Granite.Bin {
background_manager.begin_grab_focused_window ((int) x, (int) y);
}

public void cycle (bool forward) {
private void cycle (bool forward) {
var current = popover_manager.current_indicator;
if (current == null) {
return;
Expand Down