Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-06-08 04:09:15 -04:00
Code Packages Releases Activity

fix: ignore keyboard shortcuts of disabled powermenu actions (#2580)

Browse Source 
* fix: ignore keyboard shortcuts of disabled powermenu actions

* fix typo when checking for lock shortcut

* ignore shortcuts for hidden powermenu actions in grid navigation

* ignore keyboard shortcuts of disabled actions in lock power menu

* ignore keyboard shortcuts of disabled actions in lock power menu (list navigation)
This commit is contained in:
pathmann
2026-06-07 00:28:38 +02:00
committed by GitHub
parent e7ccb702a3
commit d356957dad
2 changed files with 100 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Modals/PowerMenuModal.qml
+58 -30
View File
@@ -352,9 +352,11 @@ DankModal {
break; break;
case Qt.Key_P: case Qt.Key_P:
if (!(event.modifiers & Qt.ControlModifier)) { if (!(event.modifiers & Qt.ControlModifier)) {
const idx = visibleActions.indexOf("poweroff"); if (visibleActions.includes("poweroff")) {
startHold("poweroff", idx); const idx = visibleActions.indexOf("poweroff");
event.accepted = true; startHold("poweroff", idx);
event.accepted = true;
}
} else { } else {
selectedIndex = (selectedIndex - 1 + visibleActions.length) % visibleActions.length; selectedIndex = (selectedIndex - 1 + visibleActions.length) % visibleActions.length;
event.accepted = true; event.accepted = true;
@@ -373,28 +375,40 @@ DankModal {
} }
break; break;
case Qt.Key_R: case Qt.Key_R:
startHold("reboot", visibleActions.indexOf("reboot")); if (visibleActions.includes("reboot")) {
event.accepted = true; startHold("reboot", visibleActions.indexOf("reboot"));
event.accepted = true;
}
break; break;
case Qt.Key_X: case Qt.Key_X:
startHold("logout", visibleActions.indexOf("logout")); if (visibleActions.includes("logout")) {
event.accepted = true; startHold("logout", visibleActions.indexOf("logout"));
event.accepted = true;
}
break; break;
case Qt.Key_L: case Qt.Key_L:
startHold("lock", visibleActions.indexOf("lock")); if (visibleActions.includes("lock")) {
event.accepted = true; startHold("lock", visibleActions.indexOf("lock"));
event.accepted = true;
}
break; break;
case Qt.Key_S: case Qt.Key_S:
startHold("suspend", visibleActions.indexOf("suspend")); if (visibleActions.includes("suspend")) {
event.accepted = true; startHold("suspend", visibleActions.indexOf("suspend"));
event.accepted = true;
}
break; break;
case Qt.Key_H: case Qt.Key_H:
startHold("hibernate", visibleActions.indexOf("hibernate")); if (visibleActions.includes("hibernate")) {
event.accepted = true; startHold("hibernate", visibleActions.indexOf("hibernate"));
event.accepted = true;
}
break; break;
case Qt.Key_D: case Qt.Key_D:
startHold("restart", visibleActions.indexOf("restart")); if (visibleActions.includes("restart")) {
event.accepted = true; startHold("restart", visibleActions.indexOf("restart"));
event.accepted = true;
}
break; break;
} }
} }
@@ -445,9 +459,11 @@ DankModal {
break; break;
case Qt.Key_P: case Qt.Key_P:
if (!(event.modifiers & Qt.ControlModifier)) { if (!(event.modifiers & Qt.ControlModifier)) {
const idx = visibleActions.indexOf("poweroff"); if (visibleActions.includes("poweroff")) {
startHold("poweroff", idx); const idx = visibleActions.indexOf("poweroff");
event.accepted = true; startHold("poweroff", idx);
event.accepted = true;
}
} else { } else {
selectedCol = (selectedCol - 1 + gridColumns) % gridColumns; selectedCol = (selectedCol - 1 + gridColumns) % gridColumns;
selectedIndex = selectedRow * gridColumns + selectedCol; selectedIndex = selectedRow * gridColumns + selectedCol;
@@ -469,28 +485,40 @@ DankModal {
} }
break; break;
case Qt.Key_R: case Qt.Key_R:
startHold("reboot", visibleActions.indexOf("reboot")); if (visibleActions.includes("reboot")) {
event.accepted = true; startHold("reboot", visibleActions.indexOf("reboot"));
event.accepted = true;
}
break; break;
case Qt.Key_X: case Qt.Key_X:
startHold("logout", visibleActions.indexOf("logout")); if (visibleActions.includes("logout")) {
event.accepted = true; startHold("logout", visibleActions.indexOf("logout"));
event.accepted = true;
}
break; break;
case Qt.Key_L: case Qt.Key_L:
startHold("lock", visibleActions.indexOf("lock")); if (visibleActions.includes("lock")) {
event.accepted = true; startHold("lock", visibleActions.indexOf("lock"));
event.accepted = true;
}
break; break;
case Qt.Key_S: case Qt.Key_S:
startHold("suspend", visibleActions.indexOf("suspend")); if (visibleActions.includes("suspend")) {
event.accepted = true; startHold("suspend", visibleActions.indexOf("suspend"));
event.accepted = true;
}
break; break;
case Qt.Key_H: case Qt.Key_H:
startHold("hibernate", visibleActions.indexOf("hibernate")); if (visibleActions.includes("hibernate")) {
event.accepted = true; startHold("hibernate", visibleActions.indexOf("hibernate"));
event.accepted = true;
}
break; break;
case Qt.Key_D: case Qt.Key_D:
startHold("restart", visibleActions.indexOf("restart")); if (visibleActions.includes("restart")) {
event.accepted = true; startHold("restart", visibleActions.indexOf("restart"));
event.accepted = true;
}
break; break;
} }
} }
quickshell/Modules/Lock/LockPowerMenu.qml
+42 -22
View File
@@ -279,9 +279,11 @@ Rectangle {
break; break;
case Qt.Key_P: case Qt.Key_P:
if (!(event.modifiers & Qt.ControlModifier)) { if (!(event.modifiers & Qt.ControlModifier)) {
const idx = visibleActions.indexOf("poweroff"); if (visibleActions.includes("poweroff")) {
startHold("poweroff", idx); const idx = visibleActions.indexOf("poweroff");
event.accepted = true; startHold("poweroff", idx);
event.accepted = true;
}
} else { } else {
selectedIndex = (selectedIndex - 1 + visibleActions.length) % visibleActions.length; selectedIndex = (selectedIndex - 1 + visibleActions.length) % visibleActions.length;
event.accepted = true; event.accepted = true;
@@ -300,20 +302,28 @@ Rectangle {
} }
break; break;
case Qt.Key_R: case Qt.Key_R:
startHold("reboot", visibleActions.indexOf("reboot")); if (visibleActions.includes("reboot")) {
event.accepted = true; startHold("reboot", visibleActions.indexOf("reboot"));
event.accepted = true;
}
break; break;
case Qt.Key_X: case Qt.Key_X:
startHold("logout", visibleActions.indexOf("logout")); if (visibleActions.includes("logout")) {
event.accepted = true; startHold("logout", visibleActions.indexOf("logout"));
event.accepted = true;
}
break; break;
case Qt.Key_S: case Qt.Key_S:
startHold("suspend", visibleActions.indexOf("suspend")); if (visibleActions.includes("suspend")) {
event.accepted = true; startHold("suspend", visibleActions.indexOf("suspend"));
event.accepted = true;
}
break; break;
case Qt.Key_H: case Qt.Key_H:
startHold("hibernate", visibleActions.indexOf("hibernate")); if (visibleActions.includes("hibernate")) {
event.accepted = true; startHold("hibernate", visibleActions.indexOf("hibernate"));
event.accepted = true;
}
break; break;
} }
} }
@@ -364,9 +374,11 @@ Rectangle {
break; break;
case Qt.Key_P: case Qt.Key_P:
if (!(event.modifiers & Qt.ControlModifier)) { if (!(event.modifiers & Qt.ControlModifier)) {
const idx = visibleActions.indexOf("poweroff"); if (visibleActions.includes("poweroff")) {
startHold("poweroff", idx); const idx = visibleActions.indexOf("poweroff");
event.accepted = true; startHold("poweroff", idx);
event.accepted = true;
}
} else { } else {
selectedCol = (selectedCol - 1 + gridColumns) % gridColumns; selectedCol = (selectedCol - 1 + gridColumns) % gridColumns;
selectedIndex = selectedRow * gridColumns + selectedCol; selectedIndex = selectedRow * gridColumns + selectedCol;
@@ -388,20 +400,28 @@ Rectangle {
} }
break; break;
case Qt.Key_R: case Qt.Key_R:
startHold("reboot", visibleActions.indexOf("reboot")); if (visibleActions.includes("reboot")) {
event.accepted = true; startHold("reboot", visibleActions.indexOf("reboot"));
event.accepted = true;
}
break; break;
case Qt.Key_X: case Qt.Key_X:
startHold("logout", visibleActions.indexOf("logout")); if (visibleActions.includes("logout")) {
event.accepted = true; startHold("logout", visibleActions.indexOf("logout"));
event.accepted = true;
}
break; break;
case Qt.Key_S: case Qt.Key_S:
startHold("suspend", visibleActions.indexOf("suspend")); if (visibleActions.includes("suspend")) {
event.accepted = true; startHold("suspend", visibleActions.indexOf("suspend"));
event.accepted = true;
}
break; break;
case Qt.Key_H: case Qt.Key_H:
startHold("hibernate", visibleActions.indexOf("hibernate")); if (visibleActions.includes("hibernate")) {
event.accepted = true; startHold("hibernate", visibleActions.indexOf("hibernate"));
event.accepted = true;
}
break; break;
} }
} }