From 5221be11416617132594b6127142370a07dac251 Mon Sep 17 00:00:00 2001 From: chenjun Date: Mon, 3 Aug 2020 11:28:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8C=89=E9=9C=80=E6=B1=82=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E8=B0=83=E6=95=B4=E6=89=98=E7=9B=98=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 根据需求文档https://shimo.im/sheets/8YQY9vyC9VRWCDC6/MODOC 重新调整托盘区域插件默认排序 Log: 修复托盘区域的挂载图标和插件区域的电源，时间图标顺序与需求不符问题 Bug: https://pms.uniontech.com/zentao/bug-view-40690.html Change-Id: I6962228101de5497e910c4053c1b7e942bec87f7 Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1123 Reviewed-by: Reviewed-by: lizhongming Reviewed-by: pengwenhao Tested-by: --- plugins/keyboard-layout/keyboardplugin.cpp | 2 +- plugins/network/networkplugin.cpp | 2 +- plugins/sound/soundplugin.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/keyboard-layout/keyboardplugin.cpp b/plugins/keyboard-layout/keyboardplugin.cpp index 665c41554..b60c6b5c6 100644 --- a/plugins/keyboard-layout/keyboardplugin.cpp +++ b/plugins/keyboard-layout/keyboardplugin.cpp @@ -82,7 +82,7 @@ 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(); + return m_proxyInter->getValue(this, key, 1).toInt(); } void KeyboardPlugin::setSortKey(const QString &itemKey, const int order) diff --git a/plugins/network/networkplugin.cpp b/plugins/network/networkplugin.cpp index 32ef0f5f5..e929cabce 100644 --- a/plugins/network/networkplugin.cpp +++ b/plugins/network/networkplugin.cpp @@ -141,7 +141,7 @@ int NetworkPlugin::itemSortKey(const QString &itemKey) { const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); - return m_proxyInter->getValue(this, key, 2).toInt(); + return m_proxyInter->getValue(this, key, 3).toInt(); } void NetworkPlugin::setSortKey(const QString &itemKey, const int order) diff --git a/plugins/sound/soundplugin.cpp b/plugins/sound/soundplugin.cpp index 3f5b10767..1b3667fd4 100644 --- a/plugins/sound/soundplugin.cpp +++ b/plugins/sound/soundplugin.cpp @@ -113,7 +113,7 @@ int SoundPlugin::itemSortKey(const QString &itemKey) { const QString key = QString("pos_%1_%2").arg(itemKey).arg(Dock::Efficient); - return m_proxyInter->getValue(this, key, 1).toInt(); + return m_proxyInter->getValue(this, key, 2).toInt(); } void SoundPlugin::setSortKey(const QString &itemKey, const int order)