From 4be26bc6043339cec4ea870f1c38e1f3f36d3bda Mon Sep 17 00:00:00 2001 From: Damian D'Souza Date: Fri, 17 Oct 2025 00:49:10 +0200 Subject: [PATCH] SessionMenu: replace select next/previous usage with wrapping version --- Modules/SessionMenu/SessionMenu.qml | 38 +++++++---------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/Modules/SessionMenu/SessionMenu.qml b/Modules/SessionMenu/SessionMenu.qml index b2a9b7fa..83afaf5f 100644 --- a/Modules/SessionMenu/SessionMenu.qml +++ b/Modules/SessionMenu/SessionMenu.qml @@ -119,18 +119,6 @@ NPanel { } // Navigation functions - function selectNext() { - if (powerOptions.length > 0) { - selectedIndex = Math.min(selectedIndex + 1, powerOptions.length - 1) - } - } - - function selectPrevious() { - if (powerOptions.length > 0) { - selectedIndex = Math.max(selectedIndex - 1, 0) - } - } - function selectNextWrapped() { if (powerOptions.length > 0) { selectedIndex = (selectedIndex + 1) % powerOptions.length @@ -182,30 +170,24 @@ NPanel { // Keyboard shortcuts Shortcut { sequence: "Ctrl+K" - onActivated: ui.selectPrevious() + onActivated: ui.selectPreviousWrapped() enabled: root.opened } Shortcut { sequence: "Ctrl+J" - onActivated: ui.selectNext() + onActivated: ui.selectNextWrapped() enabled: root.opened } Shortcut { sequence: "Up" - onActivated: ui.selectPrevious() + onActivated: ui.selectPreviousWrapped() enabled: root.opened } Shortcut { sequence: "Down" - onActivated: ui.selectNext() - enabled: root.opened - } - - Shortcut { - sequence: "Tab" onActivated: ui.selectNextWrapped() enabled: root.opened } @@ -216,6 +198,12 @@ NPanel { enabled: root.opened } + Shortcut { + sequence: "Tab" + onActivated: ui.selectNextWrapped() + enabled: root.opened + } + Shortcut { sequence: "Home" onActivated: ui.selectFirst() @@ -255,14 +243,6 @@ NPanel { } // Navigation functions - function selectNext() { - root.selectNext() - } - - function selectPrevious() { - root.selectPrevious() - } - function selectFirst() { root.selectFirst() }