diff --git a/frame/window/quickpluginmodel.cpp b/frame/window/quickpluginmodel.cpp index 6d645e4c9..10db9d6b8 100644 --- a/frame/window/quickpluginmodel.cpp +++ b/frame/window/quickpluginmodel.cpp @@ -69,7 +69,7 @@ void QuickPluginModel::removePlugin(PluginsItemInterface *itemInter) } if (m_dockedPluginsItems.contains(itemInter)) { - m_dockedPluginsItems.removeOne(itemInter); + m_dockedPluginsItems.removeAll(itemInter); Q_EMIT requestUpdate(); } } @@ -116,7 +116,7 @@ void QuickPluginModel::onPluginRemoved(PluginsItemInterface *itemInter) // 如果插件移除,无需移除下方的排序设置,因为下次插件插入的时候还会插入到下方任务栏 // 因此,此处只需要从列表中移除当前插件 if (m_dockedPluginsItems.contains(itemInter)) - m_dockedPluginsItems.removeOne(itemInter); + m_dockedPluginsItems.removeAll(itemInter); // 向外发送更新列表的信号 Q_EMIT requestUpdate(); } @@ -222,7 +222,6 @@ int QuickPluginModel::generaIndex(int insertIndex, int oldIndex) // 新的位置的索引值大于原来位置的索引值,则认为插入在原来的任务栏的后面,将前面的插件的索引值减去1 for (PluginsItemInterface *itemInter : m_dockedPluginsItems) { int pluginDockIndex = getCurrentIndex(itemInter); - qInfo() << itemInter->pluginDisplayName() << m_dockedPluginIndex[itemInter->pluginName()] << pluginDockIndex; if (pluginDockIndex > oldIndex) { if (pluginDockIndex <= insertIndex) { int tmpIndex = m_dockedPluginIndex[itemInter->pluginName()]; diff --git a/frame/window/quickpluginwindow.cpp b/frame/window/quickpluginwindow.cpp index 2b2a82e62..c8d7d600d 100644 --- a/frame/window/quickpluginwindow.cpp +++ b/frame/window/quickpluginwindow.cpp @@ -657,10 +657,9 @@ int QuickPluginWindow::getDropIndex(QPoint point) return -1; } - QList dockItemInter = QuickPluginModel::instance()->dockedPluginItems(); if (m_position == Dock::Position::Top || m_position == Dock::Position::Bottom) { // 上下方向从右向左排列 - for (int i = 0; i < dockItemInter.count() - 1; i++) { + for (int i = 0; i < dockedItems.count() - 1; i++) { QuickDockItem *dockBeforeItem = dockedItems[i]; QuickDockItem *dockItem = dockedItems[i + 1]; if (!dockItem->canInsert()) @@ -671,7 +670,7 @@ int QuickPluginWindow::getDropIndex(QPoint point) } } else { // 左右方向从下向上排列 - for (int i = 0; i < dockItemInter.count() - 1; i++) { + for (int i = 0; i < dockedItems.count() - 1; i++) { QuickDockItem *dockBeforeItem = dockedItems[i]; QuickDockItem *dockItem = dockedItems[i + 1]; if (!dockItem->canInsert())