Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-05 21:15:38 -05:00
Code Packages Releases Activity

notif: fix keyboard navi in popout

Browse Source
This commit is contained in:
bbedward
2025-12-03 00:59:41 -05:00
parent 46effd2ca4
commit 0ea0602aec
1 changed files with 67 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
quickshell/Modules/Notifications/Center/NotificationCenterPopout.qml
View File

@@ -1,9 +1,4 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Effects
import Quickshell
import Quickshell.Wayland
import Quickshell.Widgets
import qs.Common
import qs.Services
import qs.Widgets
@@ -22,7 +17,7 @@ DankPopout {
listView: null
isOpen: notificationHistoryVisible
onClose: () => {
notificationHistoryVisible = false
notificationHistoryVisible = false;
}
}
@@ -33,61 +28,72 @@ DankPopout {
shouldBeVisible: notificationHistoryVisible
function toggle() {
notificationHistoryVisible = !notificationHistoryVisible
notificationHistoryVisible = !notificationHistoryVisible;
}
onBackgroundClicked: {
notificationHistoryVisible = false
notificationHistoryVisible = false;
}
onNotificationHistoryVisibleChanged: {
if (notificationHistoryVisible) {
open()
open();
} else {
close()
close();
}
}
function setupKeyboardNavigation() {
if (!contentLoader.item)
return;
contentLoader.item.externalKeyboardController = keyboardController;
const notificationList = findChild(contentLoader.item, "notificationList");
const notificationHeader = findChild(contentLoader.item, "notificationHeader");
if (notificationList) {
keyboardController.listView = notificationList;
notificationList.keyboardController = keyboardController;
}
if (notificationHeader) {
notificationHeader.keyboardController = keyboardController;
}
keyboardController.reset();
keyboardController.rebuildFlatNavigation();
}
Connections {
target: contentLoader
function onLoaded() {
if (root.shouldBeVisible)
Qt.callLater(root.setupKeyboardNavigation);
}
}
onShouldBeVisibleChanged: {
if (shouldBeVisible) {
NotificationService.onOverlayOpen()
Qt.callLater(() => {
if (contentLoader.item) {
contentLoader.item.externalKeyboardController = keyboardController
const notificationList = findChild(contentLoader.item, "notificationList")
const notificationHeader = findChild(contentLoader.item, "notificationHeader")
if (notificationList) {
keyboardController.listView = notificationList
notificationList.keyboardController = keyboardController
}
if (notificationHeader) {
notificationHeader.keyboardController = keyboardController
}
keyboardController.reset()
keyboardController.rebuildFlatNavigation()
}
})
NotificationService.onOverlayOpen();
if (contentLoader.item)
Qt.callLater(setupKeyboardNavigation);
} else {
NotificationService.onOverlayClose()
keyboardController.keyboardNavigationActive = false
NotificationService.onOverlayClose();
keyboardController.keyboardNavigationActive = false;
}
}
function findChild(parent, objectName) {
if (parent.objectName === objectName) {
return parent
return parent;
}
for (let i = 0; i < parent.children.length; i++) {
const child = parent.children[i]
const result = findChild(child, objectName)
const child = parent.children[i];
const result = findChild(child, objectName);
if (result) {
return result
return result;
}
}
return null
return null;
}
content: Component {
@@ -98,24 +104,24 @@ DankPopout {
property real cachedHeaderHeight: 32
implicitHeight: {
let baseHeight = Theme.spacingL * 2
baseHeight += cachedHeaderHeight
baseHeight += Theme.spacingM * 2
let baseHeight = Theme.spacingL * 2;
baseHeight += cachedHeaderHeight;
baseHeight += Theme.spacingM * 2;
const settingsHeight = notificationSettings.expanded ? notificationSettings.contentHeight : 0
let listHeight = notificationList.listContentHeight
const settingsHeight = notificationSettings.expanded ? notificationSettings.contentHeight : 0;
let listHeight = notificationList.listContentHeight;
if (NotificationService.groupedNotifications.length === 0) {
listHeight = 200
listHeight = 200;
}
const maxContentArea = 600
const availableListSpace = Math.max(200, maxContentArea - settingsHeight)
const maxContentArea = 600;
const availableListSpace = Math.max(200, maxContentArea - settingsHeight);
baseHeight += settingsHeight
baseHeight += Math.min(listHeight, availableListSpace)
baseHeight += settingsHeight;
baseHeight += Math.min(listHeight, availableListSpace);
const maxHeight = root.screen ? root.screen.height * 0.8 : Screen.height * 0.8
return Math.max(300, Math.min(baseHeight, maxHeight))
const maxHeight = root.screen ? root.screen.height * 0.8 : Screen.height * 0.8;
return Math.max(300, Math.min(baseHeight, maxHeight));
}
color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
@@ -126,16 +132,16 @@ DankPopout {
Component.onCompleted: {
if (root.shouldBeVisible) {
forceActiveFocus()
forceActiveFocus();
}
}
Keys.onPressed: event => {
if (event.key === Qt.Key_Escape) {
root.close()
event.accepted = true
root.close();
event.accepted = true;
} else if (externalKeyboardController) {
externalKeyboardController.handleKey(event)
externalKeyboardController.handleKey(event);
}
}
@@ -143,10 +149,10 @@ DankPopout {
function onShouldBeVisibleChanged() {
if (root.shouldBeVisible) {
Qt.callLater(() => {
notificationContent.forceActiveFocus()
})
notificationContent.forceActiveFocus();
});
} else {
notificationContent.focus = false
notificationContent.focus = false;
}
}
target: root