From cc9af0844ce7c9ead76df0a4d99c6d9cc2463295 Mon Sep 17 00:00:00 2001 From: chenjun Date: Wed, 22 Jul 2020 20:38:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A3=B0=E9=9F=B3=E3=80=81=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E3=80=81=E9=94=AE=E7=9B=98=E5=B8=83=E5=B1=80=E7=AD=89?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=8E=92=E5=BA=8F=E6=97=B6=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=98=AF=E5=90=A6=E7=B3=BB=E7=BB=9F=E5=9B=BE?= =?UTF-8?q?=E6=A0=87,=E5=90=8C=E6=97=B6=E5=B0=86=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BB=9F=E4=B8=80=E6=88=90pos=5F%1=5F%2?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在图标排序时，对于系统图标，会自动全部排在其他图标后面，而声音图标正好是属于系统图标，在切换Dock显示模式时，会将声音图标显示在网络图标后面 Log: 修复调整声音插件顺序,切换任务栏模式之后，声音插件顺序改变问题(bug:38862) Bug: https://pms.uniontech.com/zentao/bug-view-38862.html Change-Id: Ib080d6eed3a361974142911ff81e9fa0003ae01f Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/343 Reviewed-by: lizhongming Tested-by: lizhongming --- plugins/datetime/datetimeplugin.cpp | 6 +++--- plugins/keyboard-layout/keyboardplugin.cpp | 14 ++++++++++++++ plugins/keyboard-layout/keyboardplugin.h | 3 +++ .../fashiontray/containers/abstractcontainer.cpp | 3 --- 4 files changed, 20 insertions(+), 6 deletions(-) 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) {