Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-24 21:42:51 -05:00
Code Packages Releases Activity

notifications: fix redundant height animation

Browse Source
This commit is contained in:
bbedward
2025-12-14 13:40:21 -05:00
parent ca5fe6f7db
commit cb710b2e5f
3 changed files with 373 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
quickshell/Modules/Notifications/Center/KeyboardNavigatedNotificationList.qml
View File

@@ -9,6 +9,7 @@ DankListView {
property var keyboardController: null
property bool keyboardActive: false
property bool autoScrollDisabled: false
property bool isAnimatingExpansion: false
property alias count: listView.count
property alias listContentHeight: listView.contentHeight
@@ -29,8 +30,19 @@ DankListView {
Timer {
id: positionPreservationTimer
interval: 200
running: keyboardController && keyboardController.keyboardNavigationActive && !autoScrollDisabled
running: keyboardController && keyboardController.keyboardNavigationActive && !autoScrollDisabled && !isAnimatingExpansion
repeat: true
onTriggered: {
if (keyboardController && keyboardController.keyboardNavigationActive && !autoScrollDisabled && !isAnimatingExpansion) {
keyboardController.ensureVisible();
}
}
}
Timer {
id: expansionEnsureVisibleTimer
interval: Theme.mediumDuration + 50
repeat: false
onTriggered: {
if (keyboardController && keyboardController.keyboardNavigationActive && !autoScrollDisabled) {
keyboardController.ensureVisible();
@@ -68,14 +80,7 @@ DankListView {
width: ListView.view.width
height: isDismissing ? 0 : notificationCard.height
clip: true
Behavior on height {
NumberAnimation {
duration: Theme.shortDuration
easing.type: Theme.standardEasing
}
}
clip: isDismissing
NotificationCard {
id: notificationCard
@@ -84,6 +89,23 @@ DankListView {
notificationGroup: modelData
keyboardNavigationActive: listView.keyboardActive
opacity: 1 - Math.abs(delegateRoot.swipeOffset) / (delegateRoot.width * 0.5)
onIsAnimatingChanged: {
if (isAnimating) {
listView.isAnimatingExpansion = true;
} else {
Qt.callLater(() => {
let anyAnimating = false;
for (let i = 0; i < listView.count; i++) {
const item = listView.itemAtIndex(i);
if (item && item.children[0] && item.children[0].isAnimating) {
anyAnimating = true;
break;
}
}
listView.isAnimatingExpansion = anyAnimating;
});
}
}
isGroupSelected: {
if (!keyboardController || !keyboardController.keyboardNavigationActive || !listView.keyboardActive)
@@ -173,23 +195,15 @@ DankListView {
}
function onExpandedGroupsChanged() {
if (keyboardController && keyboardController.keyboardNavigationActive) {
Qt.callLater(() => {
if (!autoScrollDisabled) {
keyboardController.ensureVisible();
}
});
}
if (!keyboardController || !keyboardController.keyboardNavigationActive)
return;
expansionEnsureVisibleTimer.restart();
}
function onExpandedMessagesChanged() {
if (keyboardController && keyboardController.keyboardNavigationActive) {
Qt.callLater(() => {
if (!autoScrollDisabled) {
keyboardController.ensureVisible();
}
});
}
if (!keyboardController || !keyboardController.keyboardNavigationActive)
return;
expansionEnsureVisibleTimer.restart();
}
}
}

165
quickshell/Modules/Notifications/Center/NotificationCard.qml
View File

@@ -1,8 +1,5 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Effects
import Quickshell
import Quickshell.Widgets
import Quickshell.Services.Notifications
import qs.Common
import qs.Services
@@ -13,9 +10,9 @@ Rectangle {
property var notificationGroup
property bool expanded: (NotificationService.expandedGroups[notificationGroup && notificationGroup.key] || false)
property bool descriptionExpanded: (NotificationService.expandedMessages[(notificationGroup && notificationGroup.latestNotification && notificationGroup.latestNotification.notification
&& notificationGroup.latestNotification.notification.id) ? (notificationGroup.latestNotification.notification.id + "_desc") : ""] || false)
property bool descriptionExpanded: (NotificationService.expandedMessages[(notificationGroup && notificationGroup.latestNotification && notificationGroup.latestNotification.notification && notificationGroup.latestNotification.notification.id) ? (notificationGroup.latestNotification.notification.id + "_desc") : ""] || false)
property bool userInitiatedExpansion: false
property bool isAnimating: false
property bool isGroupSelected: false
property int selectedNotificationIndex: -1
@@ -24,13 +21,13 @@ Rectangle {
width: parent ? parent.width : 400
height: {
if (expanded) {
return expandedContent.height + 28
return expandedContent.height + 28;
}
const baseHeight = 116
const baseHeight = 116;
if (descriptionExpanded) {
return baseHeight + descriptionText.contentHeight - (descriptionText.font.pixelSize * 1.2 * 2)
return baseHeight + descriptionText.contentHeight - (descriptionText.font.pixelSize * 1.2 * 2);
}
return baseHeight
return baseHeight;
}
radius: Theme.cornerRadius
@@ -43,36 +40,36 @@ Rectangle {
color: {
if (isGroupSelected && keyboardNavigationActive) {
return Theme.primaryPressed
return Theme.primaryPressed;
}
if (keyboardNavigationActive && expanded && selectedNotificationIndex >= 0) {
return Theme.primaryHoverLight
return Theme.primaryHoverLight;
}
return Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
return Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency);
}
border.color: {
if (isGroupSelected && keyboardNavigationActive) {
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.5)
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.5);
}
if (keyboardNavigationActive && expanded && selectedNotificationIndex >= 0) {
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.2)
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.2);
}
if (notificationGroup?.latestNotification?.urgency === NotificationUrgency.Critical) {
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.3)
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.3);
}
return Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.05)
return Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.05);
}
border.width: {
if (isGroupSelected && keyboardNavigationActive) {
return 1.5
return 1.5;
}
if (keyboardNavigationActive && expanded && selectedNotificationIndex >= 0) {
return 1
return 1;
}
if (notificationGroup?.latestNotification?.urgency === NotificationUrgency.Critical) {
return 2
return 2;
}
return 1
return 1;
}
clip: true
@@ -121,21 +118,21 @@ Rectangle {
imageSource: {
if (hasNotificationImage)
return notificationGroup.latestNotification.cleanImage
return notificationGroup.latestNotification.cleanImage;
if (notificationGroup?.latestNotification?.appIcon) {
const appIcon = notificationGroup.latestNotification.appIcon
const appIcon = notificationGroup.latestNotification.appIcon;
if (appIcon.startsWith("file://") || appIcon.startsWith("http://") || appIcon.startsWith("https://"))
return appIcon
return Quickshell.iconPath(appIcon, true)
return appIcon;
return Quickshell.iconPath(appIcon, true);
}
return ""
return "";
}
hasImage: hasNotificationImage
fallbackIcon: ""
fallbackText: {
const appName = notificationGroup?.appName || "?"
return appName.charAt(0).toUpperCase()
const appName = notificationGroup?.appName || "?";
return appName.charAt(0).toUpperCase();
}
Rectangle {
@@ -195,9 +192,9 @@ Rectangle {
StyledText {
width: parent.width
text: {
const timeStr = (notificationGroup && notificationGroup.latestNotification && notificationGroup.latestNotification.timeStr) || ""
const appName = (notificationGroup && notificationGroup.appName) || ""
return timeStr.length > 0 ? `${appName} • ${timeStr}` : appName
const timeStr = (notificationGroup && notificationGroup.latestNotification && notificationGroup.latestNotification.timeStr) || "";
const appName = (notificationGroup && notificationGroup.appName) || "";
return timeStr.length > 0 ? `${appName} • ${timeStr}` : appName;
}
color: Theme.surfaceVariantText
font.pixelSize: Theme.fontSizeSmall
@@ -238,24 +235,23 @@ Rectangle {
cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : (parent.hasMoreText || descriptionExpanded) ? Qt.PointingHandCursor : Qt.ArrowCursor
onClicked: mouse => {
if (!parent.hoveredLink && (parent.hasMoreText || descriptionExpanded)) {
const messageId = (notificationGroup && notificationGroup.latestNotification && notificationGroup.latestNotification.notification
&& notificationGroup.latestNotification.notification.id) ? (notificationGroup.latestNotification.notification.id + "_desc") : ""
NotificationService.toggleMessageExpansion(messageId)
}
}
if (!parent.hoveredLink && (parent.hasMoreText || descriptionExpanded)) {
const messageId = (notificationGroup && notificationGroup.latestNotification && notificationGroup.latestNotification.notification && notificationGroup.latestNotification.notification.id) ? (notificationGroup.latestNotification.notification.id + "_desc") : "";
NotificationService.toggleMessageExpansion(messageId);
}
}
propagateComposedEvents: true
onPressed: mouse => {
if (parent.hoveredLink) {
mouse.accepted = false
}
}
if (parent.hoveredLink) {
mouse.accepted = false;
}
}
onReleased: mouse => {
if (parent.hoveredLink) {
mouse.accepted = false
}
}
if (parent.hoveredLink) {
mouse.accepted = false;
}
}
}
}
}
@@ -335,15 +331,15 @@ Rectangle {
width: parent.width
height: {
const baseHeight = 120
const baseHeight = 120;
if (messageExpanded) {
const twoLineHeight = bodyText.font.pixelSize * 1.2 * 2
const twoLineHeight = bodyText.font.pixelSize * 1.2 * 2;
if (bodyText.implicitHeight > twoLineHeight + 2) {
const extraHeight = bodyText.implicitHeight - twoLineHeight
return baseHeight + extraHeight
const extraHeight = bodyText.implicitHeight - twoLineHeight;
return baseHeight + extraHeight;
}
}
return baseHeight
return baseHeight;
}
radius: Theme.cornerRadius
color: isSelected ? Theme.primaryPressed : Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
@@ -379,23 +375,23 @@ Rectangle {
imageSource: {
if (hasNotificationImage)
return modelData.cleanImage
return modelData.cleanImage;
if (modelData?.appIcon) {
const appIcon = modelData.appIcon
const appIcon = modelData.appIcon;
if (appIcon.startsWith("file://") || appIcon.startsWith("http://") || appIcon.startsWith("https://"))
return appIcon
return appIcon;
return Quickshell.iconPath(appIcon, true)
return Quickshell.iconPath(appIcon, true);
}
return ""
return "";
}
fallbackIcon: ""
fallbackText: {
const appName = modelData?.appName || "?"
return appName.charAt(0).toUpperCase()
const appName = modelData?.appName || "?";
return appName.charAt(0).toUpperCase();
}
}
@@ -456,22 +452,22 @@ Rectangle {
cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : (bodyText.hasMoreText || messageExpanded) ? Qt.PointingHandCursor : Qt.ArrowCursor
onClicked: mouse => {
if (!parent.hoveredLink && (bodyText.hasMoreText || messageExpanded)) {
NotificationService.toggleMessageExpansion(modelData?.notification?.id || "")
}
}
if (!parent.hoveredLink && (bodyText.hasMoreText || messageExpanded)) {
NotificationService.toggleMessageExpansion(modelData?.notification?.id || "");
}
}
propagateComposedEvents: true
onPressed: mouse => {
if (parent.hoveredLink) {
mouse.accepted = false
}
}
if (parent.hoveredLink) {
mouse.accepted = false;
}
}
onReleased: mouse => {
if (parent.hoveredLink) {
mouse.accepted = false
}
}
if (parent.hoveredLink) {
mouse.accepted = false;
}
}
}
}
}
@@ -502,11 +498,11 @@ Rectangle {
StyledText {
id: actionText
text: {
const baseText = modelData.text || "View"
const baseText = modelData.text || "View";
if (keyboardNavigationActive && (isGroupSelected || selectedNotificationIndex >= 0)) {
return `${baseText} (${index + 1})`
return `${baseText} (${index + 1})`;
}
return baseText
return baseText;
}
color: parent.isHovered ? Theme.primary : Theme.surfaceVariantText
font.pixelSize: Theme.fontSizeSmall
@@ -523,7 +519,7 @@ Rectangle {
onExited: parent.isHovered = false
onClicked: {
if (modelData && modelData.invoke) {
modelData.invoke()
modelData.invoke();
}
}
}
@@ -587,11 +583,11 @@ Rectangle {
StyledText {
id: actionText
text: {
const baseText = modelData.text || "View"
const baseText = modelData.text || "View";
if (keyboardNavigationActive && isGroupSelected) {
return `${baseText} (${index + 1})`
return `${baseText} (${index + 1})`;
}
return baseText
return baseText;
}
color: parent.isHovered ? Theme.primary : Theme.surfaceVariantText
font.pixelSize: Theme.fontSizeSmall
@@ -608,7 +604,7 @@ Rectangle {
onExited: parent.isHovered = false
onClicked: {
if (modelData && modelData.invoke) {
modelData.invoke()
modelData.invoke();
}
}
}
@@ -654,8 +650,8 @@ Rectangle {
anchors.fill: parent
visible: !expanded && (notificationGroup?.count || 0) > 1 && !descriptionExpanded
onClicked: {
root.userInitiatedExpansion = true
NotificationService.toggleGroupExpansion(notificationGroup?.key || "")
root.userInitiatedExpansion = true;
NotificationService.toggleGroupExpansion(notificationGroup?.key || "");
}
z: -1
}
@@ -677,8 +673,8 @@ Rectangle {
iconSize: 18
buttonSize: 28
onClicked: {
root.userInitiatedExpansion = true
NotificationService.toggleGroupExpansion(notificationGroup?.key || "")
root.userInitiatedExpansion = true;
NotificationService.toggleGroupExpansion(notificationGroup?.key || "");
}
}
@@ -697,7 +693,14 @@ Rectangle {
NumberAnimation {
duration: Theme.mediumDuration
easing.type: Theme.emphasizedEasing
onFinished: root.userInitiatedExpansion = false
onRunningChanged: {
if (running) {
root.isAnimating = true;
} else {
root.isAnimating = false;
root.userInitiatedExpansion = false;
}
}
}
}
}

517
quickshell/Modules/Notifications/Center/NotificationKeyboardController.qml
View File

@@ -1,5 +1,4 @@
import QtQuick
import qs.Common
import qs.Services
QtObject {
@@ -23,530 +22,518 @@ QtObject {
property bool isRebuilding: false
function rebuildFlatNavigation() {
isRebuilding = true
isRebuilding = true;
const nav = []
const groups = NotificationService.groupedNotifications
const nav = [];
const groups = NotificationService.groupedNotifications;
for (var i = 0; i < groups.length; i++) {
const group = groups[i]
const isExpanded = NotificationService.expandedGroups[group.key] || false
const group = groups[i];
const isExpanded = NotificationService.expandedGroups[group.key] || false;
nav.push({
"type": "group",
"groupIndex": i,
"notificationIndex": -1,
"groupKey": group.key,
"notificationId": ""
})
"type": "group",
"groupIndex": i,
"notificationIndex": -1,
"groupKey": group.key,
"notificationId": ""
});
if (isExpanded) {
const notifications = group.notifications || []
const maxNotifications = Math.min(notifications.length, 10)
const notifications = group.notifications || [];
const maxNotifications = Math.min(notifications.length, 10);
for (var j = 0; j < maxNotifications; j++) {
const notifId = String(notifications[j] && notifications[j].notification && notifications[j].notification.id ? notifications[j].notification.id : "")
const notifId = String(notifications[j] && notifications[j].notification && notifications[j].notification.id ? notifications[j].notification.id : "");
nav.push({
"type": "notification",
"groupIndex": i,
"notificationIndex": j,
"groupKey": group.key,
"notificationId": notifId
})
"type": "notification",
"groupIndex": i,
"notificationIndex": j,
"groupKey": group.key,
"notificationId": notifId
});
}
}
}
flatNavigation = nav
updateSelectedIndexFromId()
isRebuilding = false
flatNavigation = nav;
updateSelectedIndexFromId();
isRebuilding = false;
}
function updateSelectedIndexFromId() {
if (!keyboardNavigationActive) {
return
return;
}
for (var i = 0; i < flatNavigation.length; i++) {
const item = flatNavigation[i]
const item = flatNavigation[i];
if (selectedItemType === "group" && item.type === "group" && item.groupKey === selectedGroupKey) {
selectedFlatIndex = i
selectionVersion++ // Trigger UI update
return
selectedFlatIndex = i;
selectionVersion++; // Trigger UI update
return;
} else if (selectedItemType === "notification" && item.type === "notification" && String(item.notificationId) === String(selectedNotificationId)) {
selectedFlatIndex = i
selectionVersion++ // Trigger UI update
return
selectedFlatIndex = i;
selectionVersion++; // Trigger UI update
return;
}
}
// If not found, try to find the same group but select the group header instead
if (selectedItemType === "notification") {
for (var j = 0; j < flatNavigation.length; j++) {
const groupItem = flatNavigation[j]
const groupItem = flatNavigation[j];
if (groupItem.type === "group" && groupItem.groupKey === selectedGroupKey) {
selectedFlatIndex = j
selectedItemType = "group"
selectedNotificationId = ""
selectionVersion++ // Trigger UI update
return
selectedFlatIndex = j;
selectedItemType = "group";
selectedNotificationId = "";
selectionVersion++; // Trigger UI update
return;
}
}
}
// If still not found, clamp to valid range and update
if (flatNavigation.length > 0) {
selectedFlatIndex = Math.min(selectedFlatIndex, flatNavigation.length - 1)
selectedFlatIndex = Math.max(selectedFlatIndex, 0)
updateSelectedIdFromIndex()
selectionVersion++ // Trigger UI update
selectedFlatIndex = Math.min(selectedFlatIndex, flatNavigation.length - 1);
selectedFlatIndex = Math.max(selectedFlatIndex, 0);
updateSelectedIdFromIndex();
selectionVersion++; // Trigger UI update
}
}
function updateSelectedIdFromIndex() {
if (selectedFlatIndex >= 0 && selectedFlatIndex < flatNavigation.length) {
const item = flatNavigation[selectedFlatIndex]
selectedItemType = item.type
selectedGroupKey = item.groupKey
selectedNotificationId = item.notificationId
const item = flatNavigation[selectedFlatIndex];
selectedItemType = item.type;
selectedGroupKey = item.groupKey;
selectedNotificationId = item.notificationId;
}
}
function reset() {
selectedFlatIndex = 0
keyboardNavigationActive = false
showKeyboardHints = false
selectedFlatIndex = 0;
keyboardNavigationActive = false;
showKeyboardHints = false;
// Reset keyboardActive when modal is reset
if (listView) {
listView.keyboardActive = false
listView.keyboardActive = false;
}
rebuildFlatNavigation()
rebuildFlatNavigation();
}
function selectNext() {
keyboardNavigationActive = true
keyboardNavigationActive = true;
if (flatNavigation.length === 0)
return
return;
// Re-enable auto-scrolling when arrow keys are used
if (listView && listView.enableAutoScroll) {
listView.enableAutoScroll()
listView.enableAutoScroll();
}
selectedFlatIndex = Math.min(selectedFlatIndex + 1, flatNavigation.length - 1)
updateSelectedIdFromIndex()
selectionVersion++
ensureVisible()
selectedFlatIndex = Math.min(selectedFlatIndex + 1, flatNavigation.length - 1);
updateSelectedIdFromIndex();
selectionVersion++;
ensureVisible();
}
function selectNextWrapping() {
keyboardNavigationActive = true
keyboardNavigationActive = true;
if (flatNavigation.length === 0)
return
return;
// Re-enable auto-scrolling when arrow keys are used
if (listView && listView.enableAutoScroll) {
listView.enableAutoScroll()
listView.enableAutoScroll();
}
selectedFlatIndex = (selectedFlatIndex + 1) % flatNavigation.length
updateSelectedIdFromIndex()
selectionVersion++
ensureVisible()
selectedFlatIndex = (selectedFlatIndex + 1) % flatNavigation.length;
updateSelectedIdFromIndex();
selectionVersion++;
ensureVisible();
}
function selectPrevious() {
keyboardNavigationActive = true
keyboardNavigationActive = true;
if (flatNavigation.length === 0)
return
return;
// Re-enable auto-scrolling when arrow keys are used
if (listView && listView.enableAutoScroll) {
listView.enableAutoScroll()
listView.enableAutoScroll();
}
selectedFlatIndex = Math.max(selectedFlatIndex - 1, 0)
updateSelectedIdFromIndex()
selectionVersion++
ensureVisible()
selectedFlatIndex = Math.max(selectedFlatIndex - 1, 0);
updateSelectedIdFromIndex();
selectionVersion++;
ensureVisible();
}
function toggleGroupExpanded() {
if (flatNavigation.length === 0 || selectedFlatIndex >= flatNavigation.length)
return
const currentItem = flatNavigation[selectedFlatIndex]
const groups = NotificationService.groupedNotifications
const group = groups[currentItem.groupIndex]
return;
const currentItem = flatNavigation[selectedFlatIndex];
const groups = NotificationService.groupedNotifications;
const group = groups[currentItem.groupIndex];
if (!group)
return
return;
// Prevent expanding groups with < 2 notifications
const notificationCount = group.notifications ? group.notifications.length : 0
const notificationCount = group.notifications ? group.notifications.length : 0;
if (notificationCount < 2)
return
return;
const wasExpanded = NotificationService.expandedGroups[group.key] || false;
const groupIndex = currentItem.groupIndex;
const wasExpanded = NotificationService.expandedGroups[group.key] || false
const groupIndex = currentItem.groupIndex
isTogglingGroup = true
NotificationService.toggleGroupExpansion(group.key)
rebuildFlatNavigation()
isTogglingGroup = true;
NotificationService.toggleGroupExpansion(group.key);
rebuildFlatNavigation();
// Smart selection after toggle
if (!wasExpanded) {
// Just expanded - move to first notification in the group
for (var i = 0; i < flatNavigation.length; i++) {
if (flatNavigation[i].type === "notification" && flatNavigation[i].groupIndex === groupIndex) {
selectedFlatIndex = i
break
selectedFlatIndex = i;
break;
}
}
} else {
// Just collapsed - stay on the group header
for (var i = 0; i < flatNavigation.length; i++) {
if (flatNavigation[i].type === "group" && flatNavigation[i].groupIndex === groupIndex) {
selectedFlatIndex = i
break
selectedFlatIndex = i;
break;
}
}
}
isTogglingGroup = false
ensureVisible()
isTogglingGroup = false;
}
function handleEnterKey() {
if (flatNavigation.length === 0 || selectedFlatIndex >= flatNavigation.length)
return
const currentItem = flatNavigation[selectedFlatIndex]
const groups = NotificationService.groupedNotifications
const group = groups[currentItem.groupIndex]
return;
const currentItem = flatNavigation[selectedFlatIndex];
const groups = NotificationService.groupedNotifications;
const group = groups[currentItem.groupIndex];
if (!group)
return
return;
if (currentItem.type === "group") {
const notificationCount = group.notifications ? group.notifications.length : 0
const notificationCount = group.notifications ? group.notifications.length : 0;
if (notificationCount >= 2) {
toggleGroupExpanded()
toggleGroupExpanded();
} else {
executeAction(0)
executeAction(0);
}
} else if (currentItem.type === "notification") {
executeAction(0)
executeAction(0);
}
}
function toggleTextExpanded() {
if (flatNavigation.length === 0 || selectedFlatIndex >= flatNavigation.length)
return
const currentItem = flatNavigation[selectedFlatIndex]
const groups = NotificationService.groupedNotifications
const group = groups[currentItem.groupIndex]
return;
const currentItem = flatNavigation[selectedFlatIndex];
const groups = NotificationService.groupedNotifications;
const group = groups[currentItem.groupIndex];
if (!group)
return
let messageId = ""
return;
let messageId = "";
if (currentItem.type === "group") {
messageId = group.latestNotification?.notification?.id + "_desc"
messageId = group.latestNotification?.notification?.id + "_desc";
} else if (currentItem.type === "notification" && currentItem.notificationIndex >= 0 && currentItem.notificationIndex < group.notifications.length) {
messageId = group.notifications[currentItem.notificationIndex]?.notification?.id + "_desc"
messageId = group.notifications[currentItem.notificationIndex]?.notification?.id + "_desc";
}
if (messageId) {
NotificationService.toggleMessageExpansion(messageId)
NotificationService.toggleMessageExpansion(messageId);
}
}
function executeAction(actionIndex) {
if (flatNavigation.length === 0 || selectedFlatIndex >= flatNavigation.length)
return
const currentItem = flatNavigation[selectedFlatIndex]
const groups = NotificationService.groupedNotifications
const group = groups[currentItem.groupIndex]
return;
const currentItem = flatNavigation[selectedFlatIndex];
const groups = NotificationService.groupedNotifications;
const group = groups[currentItem.groupIndex];
if (!group)
return
let actions = []
return;
let actions = [];
if (currentItem.type === "group") {
actions = group.latestNotification?.actions || []
actions = group.latestNotification?.actions || [];
} else if (currentItem.type === "notification" && currentItem.notificationIndex >= 0 && currentItem.notificationIndex < group.notifications.length) {
actions = group.notifications[currentItem.notificationIndex]?.actions || []
actions = group.notifications[currentItem.notificationIndex]?.actions || [];
}
if (actionIndex >= 0 && actionIndex < actions.length) {
const action = actions[actionIndex]
const action = actions[actionIndex];
if (action.invoke) {
action.invoke()
action.invoke();
if (onClose)
onClose()
onClose();
}
}
}
function clearSelected() {
if (flatNavigation.length === 0 || selectedFlatIndex >= flatNavigation.length)
return
const currentItem = flatNavigation[selectedFlatIndex]
const groups = NotificationService.groupedNotifications
const group = groups[currentItem.groupIndex]
return;
const currentItem = flatNavigation[selectedFlatIndex];
const groups = NotificationService.groupedNotifications;
const group = groups[currentItem.groupIndex];
if (!group)
return
return;
if (currentItem.type === "group") {
NotificationService.dismissGroup(group.key)
NotificationService.dismissGroup(group.key);
} else if (currentItem.type === "notification") {
const notification = group.notifications[currentItem.notificationIndex]
NotificationService.dismissNotification(notification)
const notification = group.notifications[currentItem.notificationIndex];
NotificationService.dismissNotification(notification);
}
rebuildFlatNavigation()
rebuildFlatNavigation();
if (flatNavigation.length === 0) {
keyboardNavigationActive = false
keyboardNavigationActive = false;
if (listView) {
listView.keyboardActive = false
listView.keyboardActive = false;
}
} else {
selectedFlatIndex = Math.min(selectedFlatIndex, flatNavigation.length - 1)
updateSelectedIdFromIndex()
ensureVisible()
selectedFlatIndex = Math.min(selectedFlatIndex, flatNavigation.length - 1);
updateSelectedIdFromIndex();
ensureVisible();
}
}
function findRepeater(parent) {
if (!parent || !parent.children) {
return null
return null;
}
for (var i = 0; i < parent.children.length; i++) {
const child = parent.children[i]
const child = parent.children[i];
if (child.objectName === "notificationRepeater") {
return child
return child;
}
const found = findRepeater(child)
const found = findRepeater(child);
if (found) {
return found
return found;
}
}
return null
return null;
}
function ensureVisible() {
if (flatNavigation.length === 0 || selectedFlatIndex >= flatNavigation.length || !listView)
return
const currentItem = flatNavigation[selectedFlatIndex]
return;
const currentItem = flatNavigation[selectedFlatIndex];
if (keyboardNavigationActive && currentItem && currentItem.groupIndex >= 0) {
if (currentItem.type === "notification") {
const groupDelegate = listView.itemAtIndex(currentItem.groupIndex)
const groupDelegate = listView.itemAtIndex(currentItem.groupIndex);
if (groupDelegate && groupDelegate.children && groupDelegate.children.length > 0) {
const notificationCard = groupDelegate.children[0]
const repeater = findRepeater(notificationCard)
const notificationCard = groupDelegate.children[0];
const repeater = findRepeater(notificationCard);
if (repeater && currentItem.notificationIndex < repeater.count) {
const notificationItem = repeater.itemAt(currentItem.notificationIndex)
const notificationItem = repeater.itemAt(currentItem.notificationIndex);
if (notificationItem) {
const itemPos = notificationItem.mapToItem(listView.contentItem, 0, 0)
const itemY = itemPos.y
const itemHeight = notificationItem.height
const itemPos = notificationItem.mapToItem(listView.contentItem, 0, 0);
const itemY = itemPos.y;
const itemHeight = notificationItem.height;
const viewportTop = listView.contentY
const viewportBottom = listView.contentY + listView.height
const viewportTop = listView.contentY;
const viewportBottom = listView.contentY + listView.height;
if (itemY < viewportTop) {
listView.contentY = itemY - 20
listView.contentY = itemY - 20;
} else if (itemY + itemHeight > viewportBottom) {
listView.contentY = itemY + itemHeight - listView.height + 20
listView.contentY = itemY + itemHeight - listView.height + 20;
}
}
}
}
} else {
listView.positionViewAtIndex(currentItem.groupIndex, ListView.Contain)
listView.positionViewAtIndex(currentItem.groupIndex, ListView.Contain);
}
listView.forceLayout()
listView.forceLayout();
}
}
function handleKey(event) {
if ((event.key === Qt.Key_Delete || event.key === Qt.Key_Backspace) && (event.modifiers & Qt.ShiftModifier)) {
NotificationService.clearAllNotifications()
rebuildFlatNavigation()
NotificationService.clearAllNotifications();
rebuildFlatNavigation();
if (flatNavigation.length === 0) {
keyboardNavigationActive = false
keyboardNavigationActive = false;
if (listView) {
listView.keyboardActive = false
listView.keyboardActive = false;
}
} else {
selectedFlatIndex = 0
updateSelectedIdFromIndex()
selectedFlatIndex = 0;
updateSelectedIdFromIndex();
}
selectionVersion++
event.accepted = true
return
selectionVersion++;
event.accepted = true;
return;
}
if (event.key === Qt.Key_Escape) {
if (keyboardNavigationActive) {
keyboardNavigationActive = false
event.accepted = true
keyboardNavigationActive = false;
event.accepted = true;
} else {
if (onClose)
onClose()
event.accepted = true
onClose();
event.accepted = true;
}
} else if (event.key === Qt.Key_Down || event.key === 16777237) {
if (!keyboardNavigationActive) {
keyboardNavigationActive = true
rebuildFlatNavigation() // Ensure we have fresh navigation data
selectedFlatIndex = 0
updateSelectedIdFromIndex()
keyboardNavigationActive = true;
rebuildFlatNavigation(); // Ensure we have fresh navigation data
selectedFlatIndex = 0;
updateSelectedIdFromIndex();
// Set keyboardActive on listView to show highlight
if (listView) {
listView.keyboardActive = true
listView.keyboardActive = true;
}
selectionVersion++
ensureVisible()
event.accepted = true
selectionVersion++;
ensureVisible();
event.accepted = true;
} else {
selectNext()
event.accepted = true
selectNext();
event.accepted = true;
}
} else if (event.key === Qt.Key_Up || event.key === 16777235) {
if (!keyboardNavigationActive) {
keyboardNavigationActive = true
rebuildFlatNavigation() // Ensure we have fresh navigation data
selectedFlatIndex = 0
updateSelectedIdFromIndex()
keyboardNavigationActive = true;
rebuildFlatNavigation(); // Ensure we have fresh navigation data
selectedFlatIndex = 0;
updateSelectedIdFromIndex();
// Set keyboardActive on listView to show highlight
if (listView) {
listView.keyboardActive = true
listView.keyboardActive = true;
}
selectionVersion++
ensureVisible()
event.accepted = true
selectionVersion++;
ensureVisible();
event.accepted = true;
} else if (selectedFlatIndex === 0) {
keyboardNavigationActive = false
keyboardNavigationActive = false;
// Reset keyboardActive when navigation is disabled
if (listView) {
listView.keyboardActive = false
listView.keyboardActive = false;
}
selectionVersion++
event.accepted = true
return
selectionVersion++;
event.accepted = true;
return;
} else {
selectPrevious()
event.accepted = true
selectPrevious();
event.accepted = true;
}
} else if (event.key === Qt.Key_N && event.modifiers & Qt.ControlModifier) {
if (!keyboardNavigationActive) {
keyboardNavigationActive = true
rebuildFlatNavigation()
selectedFlatIndex = 0
updateSelectedIdFromIndex()
keyboardNavigationActive = true;
rebuildFlatNavigation();
selectedFlatIndex = 0;
updateSelectedIdFromIndex();
if (listView) {
listView.keyboardActive = true
listView.keyboardActive = true;
}
selectionVersion++
ensureVisible()
selectionVersion++;
ensureVisible();
} else {
selectNext()
selectNext();
}
event.accepted = true
event.accepted = true;
} else if (event.key === Qt.Key_P && event.modifiers & Qt.ControlModifier) {
if (!keyboardNavigationActive) {
keyboardNavigationActive = true
rebuildFlatNavigation()
selectedFlatIndex = 0
updateSelectedIdFromIndex()
keyboardNavigationActive = true;
rebuildFlatNavigation();
selectedFlatIndex = 0;
updateSelectedIdFromIndex();
if (listView) {
listView.keyboardActive = true
listView.keyboardActive = true;
}
selectionVersion++
ensureVisible()
selectionVersion++;
ensureVisible();
} else if (selectedFlatIndex === 0) {
keyboardNavigationActive = false
keyboardNavigationActive = false;
if (listView) {
listView.keyboardActive = false
listView.keyboardActive = false;
}
selectionVersion++
selectionVersion++;
} else {
selectPrevious()
selectPrevious();
}
event.accepted = true
event.accepted = true;
} else if (event.key === Qt.Key_J && event.modifiers & Qt.ControlModifier) {
if (!keyboardNavigationActive) {
keyboardNavigationActive = true
rebuildFlatNavigation()
selectedFlatIndex = 0
updateSelectedIdFromIndex()
keyboardNavigationActive = true;
rebuildFlatNavigation();
selectedFlatIndex = 0;
updateSelectedIdFromIndex();
if (listView) {
listView.keyboardActive = true
listView.keyboardActive = true;
}
selectionVersion++
ensureVisible()
selectionVersion++;
ensureVisible();
} else {
selectNext()
selectNext();
}
event.accepted = true
event.accepted = true;
} else if (event.key === Qt.Key_K && event.modifiers & Qt.ControlModifier) {
if (!keyboardNavigationActive) {
keyboardNavigationActive = true
rebuildFlatNavigation()
selectedFlatIndex = 0
updateSelectedIdFromIndex()
keyboardNavigationActive = true;
rebuildFlatNavigation();
selectedFlatIndex = 0;
updateSelectedIdFromIndex();
if (listView) {
listView.keyboardActive = true
listView.keyboardActive = true;
}
selectionVersion++
ensureVisible()
selectionVersion++;
ensureVisible();
} else if (selectedFlatIndex === 0) {
keyboardNavigationActive = false
keyboardNavigationActive = false;
if (listView) {
listView.keyboardActive = false
listView.keyboardActive = false;
}
selectionVersion++
selectionVersion++;
} else {
selectPrevious()
selectPrevious();
}
event.accepted = true
event.accepted = true;
} else if (keyboardNavigationActive) {
if (event.key === Qt.Key_Space) {
toggleGroupExpanded()
event.accepted = true
toggleGroupExpanded();
event.accepted = true;
} else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
handleEnterKey()
event.accepted = true
handleEnterKey();
event.accepted = true;
} else if (event.key === Qt.Key_E) {
toggleTextExpanded()
event.accepted = true
toggleTextExpanded();
event.accepted = true;
} else if (event.key === Qt.Key_Delete || event.key === Qt.Key_Backspace) {
clearSelected()
event.accepted = true
clearSelected();
event.accepted = true;
} else if (event.key === Qt.Key_Tab) {
selectNext()
event.accepted = true
selectNext();
event.accepted = true;
} else if (event.key === Qt.Key_Backtab) {
selectPrevious()
event.accepted = true
selectPrevious();
event.accepted = true;
} else if (event.key >= Qt.Key_1 && event.key <= Qt.Key_9) {
const actionIndex = event.key - Qt.Key_1
executeAction(actionIndex)
event.accepted = true
const actionIndex = event.key - Qt.Key_1;
executeAction(actionIndex);
event.accepted = true;
}
}
if (event.key === Qt.Key_F10) {
showKeyboardHints = !showKeyboardHints
event.accepted = true
showKeyboardHints = !showKeyboardHints;
event.accepted = true;
}
}
@@ -557,13 +544,13 @@ QtObject {
"type": "",
"groupIndex": -1,
"notificationIndex": -1
}
};
}
const result = flatNavigation[selectedFlatIndex] || {
"type": "",
"groupIndex": -1,
"notificationIndex": -1
}
return result
};
return result;
}
}