Skip to content

fix: Fix the issue of tray area icons moving when released #1488

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
Mar 9, 2026
Merged

fix: Fix the issue of tray area icons moving when released #1488

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
22 changes: 17 additions & 5 deletions panels/dock/tray/traysortordermodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,17 @@ bool TraySortOrderModel::dropToDockTray(const QString &draggedSurfaceId, int dro
}

if (dropOnSurfaceId == QLatin1String("internal/action-toggle-quick-settings")) {
return false;
if (forbiddenSections.contains(SECTION_PINNED)) return false;
if (sourceSection == &m_pinnedIds) {
int idx = m_pinnedIds.indexOf(draggedSurfaceId);
if (idx >= 0) {
m_pinnedIds.move(idx, m_pinnedIds.count() - 1);
}
} else {
sourceSection->removeOne(draggedSurfaceId);
m_pinnedIds.append(draggedSurfaceId);
}
return true;
}

if (dropOnSurfaceId == draggedSurfaceId) {
Expand Down Expand Up @@ -637,14 +647,16 @@ void TraySortOrderModel::commitStagedDrop()
return;
}

// Reuse dropToDockTray logic for consistency
// isBefore is always true for staged drops (insert before the target position)
dropToDockTray(m_stagedSurfaceId, m_stagedVisualIndex, true);
// Save staged values before clearing
QString surfaceId = m_stagedSurfaceId;
int visualIndex = m_stagedVisualIndex;

// Clear staged state (dropToDockTray already called updateVisualIndexes)
m_stagedSurfaceId.clear();
m_stagedVisualIndex = -1;
emit stagedDropChanged();

updateVisualIndexes();
dropToDockTray(surfaceId, visualIndex, true);
}

void TraySortOrderModel::clearStagedDrop()
Expand Down