marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

notifications: Don't factor action drawer state in expiry

Browse source 
Currently opening the action drawer causes notification popups to
"expire", causing some unintended behaviour (ex. dismiss alarm/timer).

This commit removes this behaviour, and also fixes notification popup
expiry while the action drawer is open.

Fixes https://invent.kde.org/plasma/plasma-mobile/-/issues/468
This commit is contained in:
Devin Lin 2025-06-13 00:05:51 -04:00
parent a83e99ae8c
commit 7f8c9f8d5e
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/mobileshell/qml/popups/notifications/NotificationPopup.qml
View file

@ -50,7 +50,6 @@ Item {
onTriggered: { onTriggered: {
visible = true; visible = true;
updateNotificationPopups(); updateNotificationPopups();
checkActionDrawerOpened();
} }
} }
@ -73,7 +72,7 @@ Item {
} }
return true; return true;
} }
onTriggered: notificationPopup.closePopup(popupIndex) onTriggered: notificationPopup.closePopup(popupIndex);
} }
// the value of how much time is left, normalized from 1 to 0 // the value of how much time is left, normalized from 1 to 0
@ -180,9 +179,6 @@ Item {
popupNotifications.currentPopupIndex = popupIndex; popupNotifications.currentPopupIndex = popupIndex;
} }
} }
// if the action drawer opens, it is best to dismiss all popup notifications
onIsActionDrawerOpenChanged: checkActionDrawerOpened()
property bool isActionDrawerOpen: MobileShellState.ShellDBusClient.isActionDrawerOpen property bool isActionDrawerOpen: MobileShellState.ShellDBusClient.isActionDrawerOpen
property bool waiting: true property bool waiting: true
@ -214,16 +210,6 @@ Item {
return model.timeout; return model.timeout;
} }
// check if the action drawer is opened and the popup is fully created
// if so, close the popup with a scale effect
function checkActionDrawerOpened() {
if (isActionDrawerOpen && popupNotifications.objectAt(popupIndex)) {
notificationPopup.expired();
keyboardInteractivity = LayerShell.Window.KeyboardInteractivityNone;
notificationItem.state = "closeWithScale";
}
}
// show the top most notification in the list and move the rest to the popup drawer // show the top most notification in the list and move the rest to the popup drawer
function updateNotificationPopups() { function updateNotificationPopups() {
if (popupCount != 1) { if (popupCount != 1) {
@ -520,7 +506,7 @@ Item {
notificationPopup.preventDismissTimeout = true; notificationPopup.preventDismissTimeout = true;
if (notificationPopup.dismissTimeout) { if (notificationPopup.dismissTimeout) {
notificationPopup.dismissClicked(); notificationPopup.dismissClicked();
} else if (!notificationPopup.isActionDrawerOpen) { } else {
notificationPopup.expired(); notificationPopup.expired();
} }
} }