diff --git a/frame/controller/dockitemmanager.cpp b/frame/controller/dockitemmanager.cpp index bd2feb178..0c073589d 100644 --- a/frame/controller/dockitemmanager.cpp +++ b/frame/controller/dockitemmanager.cpp @@ -165,8 +165,6 @@ void DockItemManager::itemMoved(DockItem *const sourceItem, DockItem *const targ // for app move, index 0 is launcher item, need to pass it. if (moveType == DockItem::App && replaceType == DockItem::App) m_appInter->MoveEntry(moveIndex - 1, replaceIndex - 1); - - refreshFSTItemSpliterVisible(); } void DockItemManager::itemAdded(const QString &appDesktop, int idx) @@ -174,22 +172,6 @@ void DockItemManager::itemAdded(const QString &appDesktop, int idx) m_appInter->RequestDock(appDesktop, idx); } -// refresh right spliter visible of fashion tray plugin item -void DockItemManager::refreshFSTItemSpliterVisible() -{ - if (DockSettings::Instance().displayMode() != Dock::DisplayMode::Fashion) { - return; - } - - for (int i = 0; i < m_itemList.size(); ++i) { - if (m_itemList.at(i)->itemType() == DockItem::ItemType::TrayPlugin) { - static_cast(m_itemList.at(i).data()) - ->setRightSplitVisible(i != (m_itemList.size() - 1)); - break; - } - } -} - void DockItemManager::appItemAdded(const QDBusObjectPath &path, const int index) { // 第一个是启动器 @@ -248,11 +230,13 @@ void DockItemManager::pluginItemInserted(PluginsItem *item) { manageItem(item); + DockItem::ItemType pluginType = item->itemType(); + // find first plugins item position int firstPluginPosition = -1; for (int i(0); i != m_itemList.size(); ++i) { DockItem::ItemType type = m_itemList[i]->itemType(); - if (type != DockItem::Plugins) + if (type != pluginType) continue; firstPluginPosition = i; @@ -284,9 +268,10 @@ void DockItemManager::pluginItemInserted(PluginsItem *item) } m_itemList.insert(insertIndex, item); - emit itemInserted(insertIndex - firstPluginPosition, item); + if(pluginType == DockItem::FixedPlugin) + insertIndex ++; - refreshFSTItemSpliterVisible(); + emit itemInserted(insertIndex - firstPluginPosition, item); } void DockItemManager::pluginItemRemoved(PluginsItem *item) diff --git a/frame/controller/dockitemmanager.h b/frame/controller/dockitemmanager.h index 24e4da601..37b45352d 100644 --- a/frame/controller/dockitemmanager.h +++ b/frame/controller/dockitemmanager.h @@ -60,7 +60,6 @@ public slots: void updatePluginsItemOrderKey(); void itemMoved(DockItem *const sourceItem, DockItem *const targetItem); void itemAdded(const QString &appDesktop, int idx); - void refreshFSTItemSpliterVisible(); private: explicit DockItemManager(QObject *parent = nullptr); diff --git a/frame/panel/mainpanelcontrol.cpp b/frame/panel/mainpanelcontrol.cpp index e30690c90..ec54cebb1 100755 --- a/frame/panel/mainpanelcontrol.cpp +++ b/frame/panel/mainpanelcontrol.cpp @@ -246,9 +246,6 @@ void MainPanelControl::insertItem(int index, DockItem *item) addFixedAreaItem(0, item); break; case DockItem::FixedPlugin: - if (index == 0) { - index += 1; - } addFixedAreaItem(index, item); break; case DockItem::App: