From 84b3d7a74e8b9e4079cfae1c698ab0598b174a96 Mon Sep 17 00:00:00 2001 From: wangxuwen Date: Fri, 27 Dec 2019 13:04:56 +0800 Subject: [PATCH] fixed(dde-dock): plugin's sequence is error for bug 10319 --- frame/controller/dockitemmanager.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frame/controller/dockitemmanager.cpp b/frame/controller/dockitemmanager.cpp index 0c073589d..945d4fe94 100644 --- a/frame/controller/dockitemmanager.cpp +++ b/frame/controller/dockitemmanager.cpp @@ -260,7 +260,13 @@ void DockItemManager::pluginItemInserted(PluginsItem *item) Q_ASSERT(pItem); const int sortKey = pItem->itemSortKey(); - if (sortKey != -1 && itemSortKey > sortKey) + if (pluginType == DockItem::FixedPlugin) { + if (sortKey != -1 && itemSortKey > sortKey) + continue; + insertIndex = i - 1; + break; + } + if (sortKey != -1 && itemSortKey > sortKey && pItem->itemType() != DockItem::FixedPlugin) continue; insertIndex = i - 1; break;