fix dismiss-all cascade, fix notification timeout type mismatch
This commit is contained in:
parent
61b49a6aa8
commit
0c89b570ac
2 changed files with 10 additions and 10 deletions
|
|
@ -69,13 +69,9 @@ M.PopupPanel {
|
|||
function _cascadeDismiss() {
|
||||
const dels = _delegates.filter(d => d && d.modelData && !d.modelData.closed);
|
||||
for (let i = 0; i < dels.length; i++) {
|
||||
const d = dels[i];
|
||||
const delay = i * 60;
|
||||
Qt.callLater(() => {
|
||||
_cascadeTimer.createObject(menuWindow, {
|
||||
_target: d,
|
||||
_delay: delay
|
||||
});
|
||||
_cascadeTimer.createObject(menuWindow, {
|
||||
_target: dels[i],
|
||||
_delay: i * 60
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -87,8 +83,8 @@ M.PopupPanel {
|
|||
interval: _delay
|
||||
running: true
|
||||
onTriggered: {
|
||||
if (_target && _target._dismissAnim)
|
||||
_target._dismissAnim.start();
|
||||
if (_target && _target.dismiss)
|
||||
_target.dismiss();
|
||||
destroy();
|
||||
}
|
||||
}
|
||||
|
|
@ -119,6 +115,10 @@ M.PopupPanel {
|
|||
readonly property real _targetHeight: notifContent.height + 12
|
||||
property real _heightScale: 1
|
||||
|
||||
function dismiss() {
|
||||
_dismissAnim.start();
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
menuWindow._delegates.push(notifItem);
|
||||
fadeIn.start();
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ QtObject {
|
|||
|
||||
property Component _expireTimer: Component {
|
||||
Timer {
|
||||
property string _notifId
|
||||
property var _notifId
|
||||
running: true
|
||||
onTriggered: {
|
||||
root.dismissPopup(_notifId);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue