diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp index 3306ca7a0..e17a96a71 100644 --- a/plugins/datetime/datetimeplugin.cpp +++ b/plugins/datetime/datetimeplugin.cpp @@ -59,7 +59,7 @@ void DatetimePlugin::init(PluginProxyInterface *proxyInter) QSettings settings("deepin", "dde-dock-datetime"); if (QFile::exists(settings.fileName())) { Dock::DisplayMode mode = displayMode(); - const QString key = QString("pos_%1").arg(mode); + const QString key = QString("pos_%1_%2").arg(pluginName()).arg(mode); proxyInter->saveValue(this, key, settings.value(key, mode == Dock::DisplayMode::Fashion ? 5 : -1)); QFile::remove(settings.fileName()); } @@ -110,7 +110,7 @@ int DatetimePlugin::itemSortKey(const QString &itemKey) { Q_UNUSED(itemKey); - const QString key = QString("pos_%1").arg(Dock::Efficient); + const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); return m_proxyInter->getValue(this, key, 5).toInt(); } @@ -118,7 +118,7 @@ void DatetimePlugin::setSortKey(const QString &itemKey, const int order) { Q_UNUSED(itemKey); - const QString key = QString("pos_%1").arg(Dock::Efficient); + const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); m_proxyInter->saveValue(this, key, order); } diff --git a/plugins/keyboard-layout/keyboardplugin.cpp b/plugins/keyboard-layout/keyboardplugin.cpp index 26d86d625..665c41554 100644 --- a/plugins/keyboard-layout/keyboardplugin.cpp +++ b/plugins/keyboard-layout/keyboardplugin.cpp @@ -77,3 +77,17 @@ QWidget *KeyboardPlugin::itemTipsWidget(const QString &itemKey) return nullptr; } + +int KeyboardPlugin::itemSortKey(const QString &itemKey) +{ + const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); + + return m_proxyInter->getValue(this, key, 2).toInt(); +} + +void KeyboardPlugin::setSortKey(const QString &itemKey, const int order) +{ + const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); + + m_proxyInter->saveValue(this, key, order); +} diff --git a/plugins/keyboard-layout/keyboardplugin.h b/plugins/keyboard-layout/keyboardplugin.h index 62a44f24a..30cb754c9 100644 --- a/plugins/keyboard-layout/keyboardplugin.h +++ b/plugins/keyboard-layout/keyboardplugin.h @@ -40,6 +40,9 @@ public: QWidget *itemWidget(const QString &itemKey) override; QWidget *itemTipsWidget(const QString &itemKey) override; + int itemSortKey(const QString &itemKey) override; + void setSortKey(const QString &itemKey, const int order) override; + private: DBusAdaptors *m_dbusAdaptors = nullptr; }; diff --git a/plugins/tray/fashiontray/containers/abstractcontainer.cpp b/plugins/tray/fashiontray/containers/abstractcontainer.cpp index 72a7f23cb..a07996198 100644 --- a/plugins/tray/fashiontray/containers/abstractcontainer.cpp +++ b/plugins/tray/fashiontray/containers/abstractcontainer.cpp @@ -293,9 +293,6 @@ int AbstractContainer::whereToInsert(FashionTrayWidgetWrapper *wrapper) return m_wrapperList.size(); } - if (wrapper->absTrayWidget()->trayTyep() == AbstractTrayWidget::TrayType::SystemTray) - destSortKey += m_wrapperList.size(); - // 当目标插入位置为列表的大小时将从最后面追加到列表中 int destIndex = m_wrapperList.size(); for (int i = 0; i < m_wrapperList.size(); ++i) {