mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2025-12-06 21:45:38 -05:00
widgets: add spacer, divider, tweak interface
This commit is contained in:
bbedward
@@ -12,9 +12,50 @@ PanelWindow {
|
||||
|
||||
required property var notificationData
|
||||
required property string notificationId
|
||||
|
||||
readonly property bool hasValidData: notificationData && notificationData.notification
|
||||
|
||||
property int screenY: 0
|
||||
property bool exiting: false
|
||||
property bool _isDestroying: false
|
||||
property bool _finalized: false
|
||||
|
||||
signal entered()
|
||||
signal exitFinished()
|
||||
|
||||
function startExit() {
|
||||
if (exiting || _isDestroying)
|
||||
return ;
|
||||
|
||||
exiting = true;
|
||||
exitAnim.restart();
|
||||
exitWatchdog.restart();
|
||||
if (NotificationService.removeFromVisibleNotifications)
|
||||
NotificationService.removeFromVisibleNotifications(win.notificationData);
|
||||
|
||||
}
|
||||
|
||||
function forceExit() {
|
||||
if (_isDestroying)
|
||||
return ;
|
||||
|
||||
_isDestroying = true;
|
||||
exiting = true;
|
||||
visible = false;
|
||||
exitWatchdog.stop();
|
||||
finalizeExit("forced");
|
||||
}
|
||||
|
||||
function finalizeExit(reason) {
|
||||
if (_finalized)
|
||||
return ;
|
||||
|
||||
_finalized = true;
|
||||
_isDestroying = true;
|
||||
exitWatchdog.stop();
|
||||
wrapperConn.enabled = false;
|
||||
wrapperConn.target = null;
|
||||
win.exitFinished();
|
||||
}
|
||||
|
||||
visible: hasValidData
|
||||
WlrLayershell.layer: WlrLayershell.Overlay
|
||||
WlrLayershell.exclusiveZone: -1
|
||||
@@ -22,6 +63,41 @@ PanelWindow {
|
||||
color: "transparent"
|
||||
implicitWidth: 400
|
||||
implicitHeight: 122
|
||||
onScreenYChanged: margins.top = Theme.barHeight + 4 + screenY
|
||||
onHasValidDataChanged: {
|
||||
if (!hasValidData && !exiting && !_isDestroying) {
|
||||
console.warn("NotificationPopup: Data became invalid, forcing exit");
|
||||
forceExit();
|
||||
}
|
||||
}
|
||||
Component.onCompleted: {
|
||||
if (hasValidData) {
|
||||
Qt.callLater(() => {
|
||||
return enterX.restart();
|
||||
});
|
||||
} else {
|
||||
console.warn("NotificationPopup created with invalid data");
|
||||
forceExit();
|
||||
}
|
||||
}
|
||||
onNotificationDataChanged: {
|
||||
if (!_isDestroying) {
|
||||
wrapperConn.target = win.notificationData || null;
|
||||
notificationConn.target = (win.notificationData && win.notificationData.notification && win.notificationData.notification.Retainable) || null;
|
||||
}
|
||||
}
|
||||
onEntered: {
|
||||
if (!_isDestroying)
|
||||
enterDelay.start();
|
||||
|
||||
}
|
||||
Component.onDestruction: {
|
||||
_isDestroying = true;
|
||||
exitWatchdog.stop();
|
||||
if (notificationData && notificationData.timer)
|
||||
notificationData.timer.stop();
|
||||
|
||||
}
|
||||
|
||||
anchors {
|
||||
top: true
|
||||
@@ -33,37 +109,11 @@ PanelWindow {
|
||||
right: 12
|
||||
}
|
||||
|
||||
property int screenY: 0
|
||||
onScreenYChanged: margins.top = Theme.barHeight + 4 + screenY
|
||||
Behavior on screenY {
|
||||
id: screenYAnim
|
||||
enabled: !exiting && !_isDestroying
|
||||
NumberAnimation {
|
||||
duration: Anims.durShort
|
||||
easing.type: Easing.BezierSpline
|
||||
easing.bezierCurve: Anims.standardDecel
|
||||
}
|
||||
}
|
||||
|
||||
property bool exiting: false
|
||||
property bool _isDestroying: false
|
||||
property bool _finalized: false
|
||||
signal entered()
|
||||
signal exitFinished()
|
||||
onHasValidDataChanged: {
|
||||
if (!hasValidData && !exiting && !_isDestroying) {
|
||||
console.warn("NotificationPopup: Data became invalid, forcing exit");
|
||||
forceExit();
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
id: content
|
||||
|
||||
anchors.fill: parent
|
||||
visible: win.hasValidData
|
||||
|
||||
transform: Translate { id: tx; x: Anims.slidePx }
|
||||
|
||||
layer.enabled: (enterX.running || exitAnim.running)
|
||||
layer.smooth: true
|
||||
|
||||
@@ -80,6 +130,7 @@ PanelWindow {
|
||||
|
||||
Rectangle {
|
||||
id: shadowLayer1
|
||||
|
||||
anchors.fill: parent
|
||||
anchors.margins: -3
|
||||
color: "transparent"
|
||||
@@ -91,6 +142,7 @@ PanelWindow {
|
||||
|
||||
Rectangle {
|
||||
id: shadowLayer2
|
||||
|
||||
anchors.fill: parent
|
||||
anchors.margins: -2
|
||||
color: "transparent"
|
||||
@@ -102,6 +154,7 @@ PanelWindow {
|
||||
|
||||
Rectangle {
|
||||
id: shadowLayer3
|
||||
|
||||
anchors.fill: parent
|
||||
color: "transparent"
|
||||
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
|
||||
@@ -133,11 +186,14 @@ PanelWindow {
|
||||
position: 0.021
|
||||
color: "transparent"
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Item {
|
||||
id: notificationContent
|
||||
|
||||
anchors.top: parent.top
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
@@ -148,6 +204,7 @@ PanelWindow {
|
||||
|
||||
Rectangle {
|
||||
id: iconContainer
|
||||
|
||||
readonly property bool hasNotificationImage: notificationData && notificationData.image && notificationData.image !== ""
|
||||
|
||||
width: 55
|
||||
@@ -161,12 +218,14 @@ PanelWindow {
|
||||
|
||||
IconImage {
|
||||
id: iconImage
|
||||
|
||||
anchors.fill: parent
|
||||
anchors.margins: 2
|
||||
asynchronous: true
|
||||
source: {
|
||||
if (!notificationData) return "";
|
||||
|
||||
if (!notificationData)
|
||||
return "";
|
||||
|
||||
if (parent.hasNotificationImage)
|
||||
return notificationData.cleanImage || "";
|
||||
|
||||
@@ -193,10 +252,12 @@ PanelWindow {
|
||||
font.weight: Font.Bold
|
||||
color: Theme.primaryText
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
id: textContainer
|
||||
|
||||
anchors.left: iconContainer.right
|
||||
anchors.leftMargin: 12
|
||||
anchors.right: parent.right
|
||||
@@ -219,7 +280,9 @@ PanelWindow {
|
||||
StyledText {
|
||||
width: parent.width
|
||||
text: {
|
||||
if (!notificationData) return "";
|
||||
if (!notificationData)
|
||||
return "";
|
||||
|
||||
const appName = notificationData.appName || "";
|
||||
const timeStr = notificationData.timeStr || "";
|
||||
if (timeStr.length > 0)
|
||||
@@ -255,22 +318,29 @@ PanelWindow {
|
||||
wrapMode: Text.WordWrap
|
||||
visible: text.length > 0
|
||||
linkColor: Theme.primary
|
||||
onLinkActivated: (link) => Qt.openUrlExternally(link)
|
||||
onLinkActivated: (link) => {
|
||||
return Qt.openUrlExternally(link);
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
acceptedButtons: Qt.NoButton
|
||||
acceptedButtons: Qt.NoButton
|
||||
cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
DankActionButton {
|
||||
id: closeButton
|
||||
|
||||
anchors.right: parent.right
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 12
|
||||
@@ -282,6 +352,7 @@ PanelWindow {
|
||||
onClicked: {
|
||||
if (notificationData && !win.exiting)
|
||||
notificationData.popup = false;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -292,20 +363,21 @@ PanelWindow {
|
||||
anchors.bottomMargin: 8
|
||||
spacing: 8
|
||||
z: 20
|
||||
|
||||
|
||||
Repeater {
|
||||
model: notificationData ? (notificationData.actions || []) : []
|
||||
|
||||
|
||||
Rectangle {
|
||||
property bool isHovered: false
|
||||
|
||||
|
||||
width: Math.max(actionText.implicitWidth + 12, 50)
|
||||
height: 24
|
||||
radius: 4
|
||||
color: isHovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.1) : "transparent"
|
||||
|
||||
|
||||
StyledText {
|
||||
id: actionText
|
||||
|
||||
text: modelData.text || ""
|
||||
color: parent.isHovered ? Theme.primary : Theme.surfaceVariantText
|
||||
font.pixelSize: Theme.fontSizeSmall
|
||||
@@ -313,7 +385,7 @@ PanelWindow {
|
||||
anchors.centerIn: parent
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
|
||||
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
@@ -322,20 +394,24 @@ PanelWindow {
|
||||
onEntered: parent.isHovered = true
|
||||
onExited: parent.isHovered = false
|
||||
onClicked: {
|
||||
if (modelData && modelData.invoke) {
|
||||
if (modelData && modelData.invoke)
|
||||
modelData.invoke();
|
||||
}
|
||||
if (notificationData && !win.exiting) {
|
||||
|
||||
if (notificationData && !win.exiting)
|
||||
notificationData.popup = false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
id: clearButton
|
||||
|
||||
property bool isHovered: false
|
||||
|
||||
anchors.right: parent.right
|
||||
@@ -350,6 +426,7 @@ PanelWindow {
|
||||
|
||||
StyledText {
|
||||
id: clearText
|
||||
|
||||
text: "Clear"
|
||||
color: clearButton.isHovered ? Theme.primary : Theme.surfaceVariantText
|
||||
font.pixelSize: Theme.fontSizeSmall
|
||||
@@ -365,15 +442,17 @@ PanelWindow {
|
||||
onEntered: clearButton.isHovered = true
|
||||
onExited: clearButton.isHovered = false
|
||||
onClicked: {
|
||||
if (notificationData && !win.exiting) {
|
||||
if (notificationData && !win.exiting)
|
||||
NotificationService.dismissNotification(notificationData);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
id: cardHoverArea
|
||||
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
acceptedButtons: Qt.LeftButton
|
||||
@@ -382,153 +461,146 @@ PanelWindow {
|
||||
onEntered: {
|
||||
if (notificationData && notificationData.timer)
|
||||
notificationData.timer.stop();
|
||||
|
||||
}
|
||||
onExited: {
|
||||
if (notificationData && notificationData.popup && notificationData.timer)
|
||||
notificationData.timer.restart();
|
||||
|
||||
}
|
||||
onClicked: {
|
||||
if (notificationData && !win.exiting)
|
||||
notificationData.popup = false;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
transform: Translate {
|
||||
id: tx
|
||||
|
||||
x: Anims.slidePx
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
NumberAnimation {
|
||||
id: enterX
|
||||
target: tx; property: "x"; from: Anims.slidePx; to: 0
|
||||
|
||||
target: tx
|
||||
property: "x"
|
||||
from: Anims.slidePx
|
||||
to: 0
|
||||
duration: Anims.durMed
|
||||
easing.type: Easing.BezierSpline
|
||||
easing.bezierCurve: Anims.emphasizedDecel
|
||||
onStopped: if (!win.exiting && !win._isDestroying && Math.abs(tx.x) < 0.5) win.entered();
|
||||
onStopped: {
|
||||
if (!win.exiting && !win._isDestroying && Math.abs(tx.x) < 0.5) {
|
||||
win.entered();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ParallelAnimation {
|
||||
id: exitAnim
|
||||
PropertyAnimation {
|
||||
target: tx; property: "x"; from: 0; to: Anims.slidePx
|
||||
|
||||
onStopped: finalizeExit("animStopped")
|
||||
|
||||
PropertyAnimation {
|
||||
target: tx
|
||||
property: "x"
|
||||
from: 0
|
||||
to: Anims.slidePx
|
||||
duration: Anims.durShort
|
||||
easing.type: Easing.BezierSpline
|
||||
easing.bezierCurve: Anims.emphasizedAccel
|
||||
}
|
||||
NumberAnimation {
|
||||
target: content; property: "opacity"; from: 1; to: 0
|
||||
|
||||
NumberAnimation {
|
||||
target: content
|
||||
property: "opacity"
|
||||
from: 1
|
||||
to: 0
|
||||
duration: Anims.durShort
|
||||
easing.type: Easing.BezierSpline
|
||||
easing.bezierCurve: Anims.standardAccel
|
||||
}
|
||||
NumberAnimation {
|
||||
target: content; property: "scale"; from: 1; to: 0.98
|
||||
|
||||
NumberAnimation {
|
||||
target: content
|
||||
property: "scale"
|
||||
from: 1
|
||||
to: 0.98
|
||||
duration: Anims.durShort
|
||||
easing.type: Easing.BezierSpline
|
||||
easing.bezierCurve: Anims.emphasizedAccel
|
||||
}
|
||||
onStopped: finalizeExit("animStopped")
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
if (hasValidData) {
|
||||
Qt.callLater(() => enterX.restart())
|
||||
} else {
|
||||
console.warn("NotificationPopup created with invalid data");
|
||||
forceExit();
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
id: wrapperConn
|
||||
|
||||
function onPopupChanged() {
|
||||
if (!win.notificationData || win._isDestroying)
|
||||
return ;
|
||||
|
||||
if (!win.notificationData.popup && !win.exiting)
|
||||
startExit();
|
||||
|
||||
}
|
||||
|
||||
target: win.notificationData || null
|
||||
ignoreUnknownSignals: true
|
||||
enabled: !win._isDestroying
|
||||
|
||||
function onPopupChanged() {
|
||||
if (!win.notificationData || win._isDestroying) return;
|
||||
if (!win.notificationData.popup && !win.exiting) {
|
||||
startExit();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
id: notificationConn
|
||||
|
||||
function onDropped() {
|
||||
if (!win._isDestroying && !win.exiting)
|
||||
forceExit();
|
||||
|
||||
}
|
||||
|
||||
target: (win.notificationData && win.notificationData.notification && win.notificationData.notification.Retainable) || null
|
||||
ignoreUnknownSignals: true
|
||||
enabled: !win._isDestroying
|
||||
|
||||
function onDropped() {
|
||||
if (!win._isDestroying && !win.exiting) {
|
||||
forceExit();
|
||||
}
|
||||
}
|
||||
}
|
||||
onNotificationDataChanged: {
|
||||
if (!_isDestroying) {
|
||||
wrapperConn.target = win.notificationData || null;
|
||||
notificationConn.target = (win.notificationData && win.notificationData.notification && win.notificationData.notification.Retainable) || null;
|
||||
}
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: enterDelay
|
||||
|
||||
interval: 160
|
||||
repeat: false
|
||||
onTriggered: {
|
||||
if (notificationData && notificationData.timer && !exiting && !_isDestroying)
|
||||
notificationData.timer.start();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
onEntered: {
|
||||
if (!_isDestroying) enterDelay.start();
|
||||
}
|
||||
|
||||
function startExit() {
|
||||
if (exiting || _isDestroying) return;
|
||||
|
||||
exiting = true;
|
||||
exitAnim.restart();
|
||||
exitWatchdog.restart();
|
||||
|
||||
if (NotificationService.removeFromVisibleNotifications) {
|
||||
NotificationService.removeFromVisibleNotifications(win.notificationData);
|
||||
}
|
||||
}
|
||||
|
||||
function forceExit() {
|
||||
if (_isDestroying) return;
|
||||
|
||||
_isDestroying = true;
|
||||
exiting = true;
|
||||
visible = false;
|
||||
exitWatchdog.stop();
|
||||
finalizeExit("forced");
|
||||
}
|
||||
|
||||
function finalizeExit(reason) {
|
||||
if (_finalized) return;
|
||||
_finalized = true;
|
||||
_isDestroying = true;
|
||||
exitWatchdog.stop();
|
||||
|
||||
wrapperConn.enabled = false;
|
||||
wrapperConn.target = null;
|
||||
|
||||
win.exitFinished();
|
||||
}
|
||||
|
||||
Timer {
|
||||
Timer {
|
||||
id: exitWatchdog
|
||||
|
||||
interval: 600
|
||||
repeat: false
|
||||
onTriggered: finalizeExit("watchdog")
|
||||
}
|
||||
|
||||
Component.onDestruction: {
|
||||
_isDestroying = true;
|
||||
exitWatchdog.stop();
|
||||
if (notificationData && notificationData.timer) {
|
||||
notificationData.timer.stop();
|
||||
Behavior on screenY {
|
||||
id: screenYAnim
|
||||
|
||||
enabled: !exiting && !_isDestroying
|
||||
|
||||
NumberAnimation {
|
||||
duration: Anims.durShort
|
||||
easing.type: Easing.BezierSpline
|
||||
easing.bezierCurve: Anims.standardDecel
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -5,61 +5,113 @@ import qs.Services
|
||||
|
||||
QtObject {
|
||||
id: manager
|
||||
|
||||
|
||||
property var modelData
|
||||
|
||||
property int topMargin: 0
|
||||
property int baseNotificationHeight: 120
|
||||
property int maxTargetNotifications: 3
|
||||
property var popupWindows: [] // strong refs to windows (live until exitFinished)
|
||||
|
||||
property var popupWindows: [] // strong refs to windows (live until exitFinished)
|
||||
// Track destroying windows to prevent duplicate cleanup
|
||||
property var destroyingWindows: new Set()
|
||||
|
||||
// Factory
|
||||
property Component popupComponent: Component {
|
||||
property Component popupComponent
|
||||
|
||||
popupComponent: Component {
|
||||
NotificationPopup {
|
||||
onEntered: manager._onPopupEntered(this)
|
||||
onExitFinished: manager._onPopupExitFinished(this)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
property Connections notificationConnections: Connections {
|
||||
target: NotificationService
|
||||
property Connections notificationConnections
|
||||
|
||||
notificationConnections: Connections {
|
||||
function onVisibleNotificationsChanged() {
|
||||
manager._sync(NotificationService.visibleNotifications);
|
||||
}
|
||||
|
||||
target: NotificationService
|
||||
}
|
||||
|
||||
// Smart sweeper that only runs when needed
|
||||
property Timer sweeper
|
||||
|
||||
sweeper: Timer {
|
||||
interval: 2000
|
||||
running: false // Not running by default
|
||||
repeat: true
|
||||
onTriggered: {
|
||||
let toRemove = [];
|
||||
for (let p of popupWindows) {
|
||||
if (!p) {
|
||||
toRemove.push(p);
|
||||
continue;
|
||||
}
|
||||
// Check for various zombie conditions
|
||||
const isZombie = p.status === Component.Null || (!p.visible && !p.exiting) || (!p.notificationData && !p._isDestroying) || (!p.hasValidData && !p._isDestroying);
|
||||
if (isZombie) {
|
||||
console.warn("Sweeper found zombie window, cleaning up");
|
||||
toRemove.push(p);
|
||||
// Try to force cleanup
|
||||
if (p.forceExit) {
|
||||
p.forceExit();
|
||||
} else if (p.destroy) {
|
||||
try {
|
||||
p.destroy();
|
||||
} catch (e) {
|
||||
console.warn("Error destroying zombie:", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// Remove all zombies from array
|
||||
if (toRemove.length > 0) {
|
||||
for (let zombie of toRemove) {
|
||||
const i = popupWindows.indexOf(zombie);
|
||||
if (i !== -1)
|
||||
popupWindows.splice(i, 1);
|
||||
|
||||
}
|
||||
popupWindows = popupWindows.slice();
|
||||
// Recompact after cleanup
|
||||
const survivors = _active().sort((a, b) => {
|
||||
return a.screenY - b.screenY;
|
||||
});
|
||||
for (let k = 0; k < survivors.length; ++k) {
|
||||
survivors[k].screenY = topMargin + k * baseNotificationHeight;
|
||||
}
|
||||
}
|
||||
// Stop the timer if no windows remain
|
||||
if (popupWindows.length === 0)
|
||||
sweeper.stop();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
function _hasWindowFor(w) {
|
||||
return popupWindows.some(p => {
|
||||
return popupWindows.some((p) => {
|
||||
// More robust check for valid windows
|
||||
return p &&
|
||||
p.notificationData === w &&
|
||||
!p._isDestroying &&
|
||||
p.status !== Component.Null;
|
||||
return p && p.notificationData === w && !p._isDestroying && p.status !== Component.Null;
|
||||
});
|
||||
}
|
||||
|
||||
function _isValidWindow(p) {
|
||||
return p &&
|
||||
p.status !== Component.Null &&
|
||||
!p._isDestroying &&
|
||||
p.hasValidData;
|
||||
return p && p.status !== Component.Null && !p._isDestroying && p.hasValidData;
|
||||
}
|
||||
|
||||
function _sync(newWrappers) {
|
||||
// Add new notifications
|
||||
for (let w of newWrappers) {
|
||||
if (w && !_hasWindowFor(w)) {
|
||||
if (w && !_hasWindowFor(w))
|
||||
insertNewestAtTop(w);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Remove old notifications
|
||||
for (let p of popupWindows.slice()) {
|
||||
if (!_isValidWindow(p)) continue;
|
||||
|
||||
if (!_isValidWindow(p))
|
||||
continue;
|
||||
|
||||
if (p.notificationData && newWrappers.indexOf(p.notificationData) === -1 && !p.exiting) {
|
||||
p.notificationData.removedByLimit = true;
|
||||
p.notificationData.popup = false;
|
||||
@@ -71,73 +123,67 @@ QtObject {
|
||||
function insertNewestAtTop(wrapper) {
|
||||
if (!wrapper) {
|
||||
console.warn("insertNewestAtTop: wrapper is null");
|
||||
return;
|
||||
return ;
|
||||
}
|
||||
|
||||
// Shift live, non-exiting windows down *now*
|
||||
for (let p of popupWindows) {
|
||||
if (!_isValidWindow(p)) continue;
|
||||
if (p.exiting) continue;
|
||||
|
||||
if (!_isValidWindow(p))
|
||||
continue;
|
||||
|
||||
if (p.exiting)
|
||||
continue;
|
||||
|
||||
p.screenY = p.screenY + baseNotificationHeight;
|
||||
}
|
||||
|
||||
// Create the new top window at fixed Y
|
||||
const notificationId = wrapper && wrapper.notification ? wrapper.notification.id : "";
|
||||
const win = popupComponent.createObject(null, {
|
||||
notificationData: wrapper,
|
||||
notificationId: notificationId,
|
||||
screenY: topMargin,
|
||||
screen: manager.modelData
|
||||
const win = popupComponent.createObject(null, {
|
||||
"notificationData": wrapper,
|
||||
"notificationId": notificationId,
|
||||
"screenY": topMargin,
|
||||
"screen": manager.modelData
|
||||
});
|
||||
|
||||
if (!win) {
|
||||
console.warn("Popup create failed");
|
||||
return;
|
||||
if (!win) {
|
||||
console.warn("Popup create failed");
|
||||
return ;
|
||||
}
|
||||
|
||||
// Validate the window was created properly
|
||||
if (!win.hasValidData) {
|
||||
console.warn("Popup created with invalid data, destroying");
|
||||
win.destroy();
|
||||
return;
|
||||
return ;
|
||||
}
|
||||
|
||||
popupWindows.push(win);
|
||||
|
||||
// Start sweeper if it's not running
|
||||
if (!sweeper.running) {
|
||||
if (!sweeper.running)
|
||||
sweeper.start();
|
||||
}
|
||||
|
||||
|
||||
_maybeStartOverflow();
|
||||
}
|
||||
|
||||
// Overflow: keep one extra (slot #4), then ask bottom to exit gracefully
|
||||
function _active() {
|
||||
return popupWindows.filter(p => {
|
||||
return _isValidWindow(p) &&
|
||||
p.notificationData &&
|
||||
p.notificationData.popup &&
|
||||
!p.exiting;
|
||||
function _active() {
|
||||
return popupWindows.filter((p) => {
|
||||
return _isValidWindow(p) && p.notificationData && p.notificationData.popup && !p.exiting;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
function _bottom() {
|
||||
let b = null, maxY = -1;
|
||||
for (let p of _active()) {
|
||||
if (p.screenY > maxY) {
|
||||
maxY = p.screenY;
|
||||
b = p;
|
||||
if (p.screenY > maxY) {
|
||||
maxY = p.screenY;
|
||||
b = p;
|
||||
}
|
||||
}
|
||||
return b;
|
||||
}
|
||||
|
||||
|
||||
function _maybeStartOverflow() {
|
||||
const activeWindows = _active();
|
||||
if (activeWindows.length <= maxTargetNotifications + 1) return;
|
||||
|
||||
if (activeWindows.length <= maxTargetNotifications + 1)
|
||||
return ;
|
||||
|
||||
const b = _bottom();
|
||||
if (b && !b.exiting) {
|
||||
// Tell the popup to animate out (don't destroy here)
|
||||
@@ -148,34 +194,32 @@ QtObject {
|
||||
|
||||
// After entrance, you may kick overflow (optional)
|
||||
function _onPopupEntered(p) {
|
||||
if (_isValidWindow(p)) {
|
||||
if (_isValidWindow(p))
|
||||
_maybeStartOverflow();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Primary cleanup path (after the popup finishes its exit)
|
||||
function _onPopupExitFinished(p) {
|
||||
if (!p) return;
|
||||
|
||||
if (!p)
|
||||
return ;
|
||||
|
||||
// Prevent duplicate cleanup
|
||||
const windowId = p.toString();
|
||||
if (destroyingWindows.has(windowId)) {
|
||||
return;
|
||||
}
|
||||
if (destroyingWindows.has(windowId))
|
||||
return ;
|
||||
|
||||
destroyingWindows.add(windowId);
|
||||
|
||||
// Remove from popupWindows
|
||||
const i = popupWindows.indexOf(p);
|
||||
if (i !== -1) {
|
||||
if (i !== -1) {
|
||||
popupWindows.splice(i, 1);
|
||||
popupWindows = popupWindows.slice();
|
||||
popupWindows = popupWindows.slice();
|
||||
}
|
||||
|
||||
// Release the wrapper
|
||||
if (NotificationService.releaseWrapper && p.notificationData) {
|
||||
if (NotificationService.releaseWrapper && p.notificationData)
|
||||
NotificationService.releaseWrapper(p.notificationData);
|
||||
}
|
||||
|
||||
|
||||
// Schedule destruction
|
||||
Qt.callLater(() => {
|
||||
if (p && p.destroy) {
|
||||
@@ -190,103 +234,40 @@ QtObject {
|
||||
destroyingWindows.delete(windowId);
|
||||
});
|
||||
});
|
||||
|
||||
// Compact survivors (only live, non-exiting)
|
||||
const survivors = _active().sort((a, b) => a.screenY - b.screenY);
|
||||
const survivors = _active().sort((a, b) => {
|
||||
return a.screenY - b.screenY;
|
||||
});
|
||||
for (let k = 0; k < survivors.length; ++k) {
|
||||
survivors[k].screenY = topMargin + k * baseNotificationHeight;
|
||||
}
|
||||
|
||||
_maybeStartOverflow();
|
||||
}
|
||||
|
||||
// Smart sweeper that only runs when needed
|
||||
property Timer sweeper: Timer {
|
||||
interval: 2000
|
||||
running: false // Not running by default
|
||||
repeat: true
|
||||
onTriggered: {
|
||||
let toRemove = [];
|
||||
|
||||
for (let p of popupWindows) {
|
||||
if (!p) {
|
||||
toRemove.push(p);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Check for various zombie conditions
|
||||
const isZombie =
|
||||
p.status === Component.Null ||
|
||||
(!p.visible && !p.exiting) ||
|
||||
(!p.notificationData && !p._isDestroying) ||
|
||||
(!p.hasValidData && !p._isDestroying);
|
||||
|
||||
if (isZombie) {
|
||||
console.warn("Sweeper found zombie window, cleaning up");
|
||||
toRemove.push(p);
|
||||
|
||||
// Try to force cleanup
|
||||
if (p.forceExit) {
|
||||
p.forceExit();
|
||||
} else if (p.destroy) {
|
||||
try {
|
||||
p.destroy();
|
||||
} catch (e) {
|
||||
console.warn("Error destroying zombie:", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Remove all zombies from array
|
||||
if (toRemove.length > 0) {
|
||||
for (let zombie of toRemove) {
|
||||
const i = popupWindows.indexOf(zombie);
|
||||
if (i !== -1) {
|
||||
popupWindows.splice(i, 1);
|
||||
}
|
||||
}
|
||||
popupWindows = popupWindows.slice();
|
||||
|
||||
// Recompact after cleanup
|
||||
const survivors = _active().sort((a, b) => a.screenY - b.screenY);
|
||||
for (let k = 0; k < survivors.length; ++k) {
|
||||
survivors[k].screenY = topMargin + k * baseNotificationHeight;
|
||||
}
|
||||
}
|
||||
|
||||
// Stop the timer if no windows remain
|
||||
if (popupWindows.length === 0) {
|
||||
sweeper.stop();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Watch for changes to popup windows array
|
||||
onPopupWindowsChanged: {
|
||||
if (popupWindows.length > 0 && !sweeper.running) {
|
||||
sweeper.start();
|
||||
} else if (popupWindows.length === 0 && sweeper.running) {
|
||||
sweeper.stop();
|
||||
}
|
||||
}
|
||||
|
||||
// Emergency cleanup function
|
||||
function cleanupAllWindows() {
|
||||
sweeper.stop();
|
||||
|
||||
for (let p of popupWindows.slice()) {
|
||||
if (p) {
|
||||
try {
|
||||
if (p.forceExit) p.forceExit();
|
||||
else if (p.destroy) p.destroy();
|
||||
if (p.forceExit)
|
||||
p.forceExit();
|
||||
else if (p.destroy)
|
||||
p.destroy();
|
||||
} catch (e) {
|
||||
console.warn("Error during emergency cleanup:", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
popupWindows = [];
|
||||
destroyingWindows.clear();
|
||||
destroyingWindows.clear();
|
||||
}
|
||||
}
|
||||
|
||||
// Watch for changes to popup windows array
|
||||
onPopupWindowsChanged: {
|
||||
if (popupWindows.length > 0 && !sweeper.running)
|
||||
sweeper.start();
|
||||
else if (popupWindows.length === 0 && sweeper.running)
|
||||
sweeper.stop();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user