Skip to content

fix: WeChat and WXChat are recognized as the same #964

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

Merged
deepin-bot merged 1 commit into from
Dec 13, 2024
Merged

fix: WeChat and WXChat are recognized as the same #964

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
2 changes: 1 addition & 1 deletion panels/dock/taskmanager/abstractwindowmonitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ QVariant AbstractWindowMonitor::data(const QModelIndex &index, int role) const

void AbstractWindowMonitor::trackWindow(AbstractWindow* window)
{
beginInsertRows(QModelIndex(), m_trackedWindows.size(), m_trackedWindows.size() + 1);
beginInsertRows(QModelIndex(), m_trackedWindows.size(), m_trackedWindows.size());
m_trackedWindows.append(window);
endInsertRows();

Expand Down
8 changes: 4 additions & 4 deletions panels/dock/taskmanager/rolecombinemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RoleCombineModel::RoleCombineModel(QAbstractItemModel* major, QAbstractItemModel

connect(sourceModel(), &QAbstractItemModel::rowsInserted, this, [this, majorRoles, func](const QModelIndex &parent, int first, int last) {
beginInsertRows(index(parent.row(), parent.column()), first, last);
for (int i = first; i < last; i++) {
for (int i = first; i <= last; i++) {
QModelIndex majorIndex = sourceModel()->index(i, 0);
QModelIndex minorIndex = func(majorIndex.data(majorRoles), m_minor);
if (majorIndex.isValid() && minorIndex.isValid())
Expand All @@ -35,7 +35,7 @@ RoleCombineModel::RoleCombineModel(QAbstractItemModel* major, QAbstractItemModel
});
connect(sourceModel(), &QAbstractItemModel::columnsInserted, this, [this, majorRoles, func](const QModelIndex &parent, int first, int last) {
beginInsertColumns(index(parent.row(), parent.column()), first, last);
for (int j = first; j < last; j++) {
for (int j = first; j <= last; j++) {
QModelIndex majorIndex = sourceModel()->index(0, j);
QModelIndex minorIndex = func(majorIndex.data(majorRoles), m_minor);
if (majorIndex.isValid() && minorIndex.isValid())
Expand All @@ -46,7 +46,7 @@ RoleCombineModel::RoleCombineModel(QAbstractItemModel* major, QAbstractItemModel

connect(sourceModel(), &QAbstractItemModel::rowsRemoved, this, [this](const QModelIndex &parent, int first, int last) {
beginRemoveRows(index(parent.row(), parent.column()), first, last);
for (int i = first; i < last; i++) {
for (int i = first; i <= last; i++) {
if (m_indexMap.contains(qMakePair(i, 0))) {
m_indexMap.remove(qMakePair(i, 0));
}
Expand All @@ -55,7 +55,7 @@ RoleCombineModel::RoleCombineModel(QAbstractItemModel* major, QAbstractItemModel
});
connect(sourceModel(), &QAbstractItemModel::columnsRemoved, this, [this](const QModelIndex &parent, int first, int last) {
beginRemoveColumns(index(parent.row(), parent.column()), first, last);
for (int j = first; j < last; j++) {
for (int j = first; j <= last; j++) {
if (m_indexMap.contains(qMakePair(0, j))) {
m_indexMap.remove(qMakePair(0, j));
}
Expand Down
Loading