Skip to content

fix(notification): avoid delayed-remove id collision #1452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ivy233 wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −7
Open

fix(notification): avoid delayed-remove id collision #1452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions panels/notification/bubble/bubblemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -83,7 +83,7 @@ void BubbleModel::clear()
m_bubbles.clear();
endResetModel();
m_delayBubbles.clear();
m_delayRemovedBubble = -1;
m_delayRemovedBubble = 0;

updateLevel();
m_updateTimeTipTimer->stop();
Expand Down
4 changes: 2 additions & 2 deletions panels/notification/bubble/bubblemodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -82,7 +82,7 @@ class BubbleModel : public QAbstractListModel
int m_contentRowCount{6};
const int OverlayMaxCount{2};
QList<qint64> m_delayBubbles;
qint64 m_delayRemovedBubble{-1};
qint64 m_delayRemovedBubble{0};
const int DelayRemovBubbleTime{1000};
};

Expand Down
4 changes: 2 additions & 2 deletions panels/notification/bubble/package/Bubble.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand All @@ -16,7 +16,7 @@ Control {
if (control.hovered) {
Applet.bubbles.delayRemovedBubble = bubble.id
} else {
Applet.bubbles.delayRemovedBubble = -1
Applet.bubbles.delayRemovedBubble = 0
}
}

Expand Down
3 changes: 2 additions & 1 deletion panels/notification/common/memoryaccessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -34,6 +34,7 @@ qint64 MemoryAccessor::replaceEntity(qint64 id, const NotifyEntity &entity)
const auto index = (iter - m_entities.begin());
Q_ASSERT(index >= 0);
m_entities[index] = entity;
m_entities[index].setId(id);
} else {
return -1;
}
Expand Down