From 968140e6e2b3101942f2f706c215ae38336538fd Mon Sep 17 00:00:00 2001
From: YinJie <yinjie@uniontech.com>
Date: Tue, 18 Oct 2022 18:10:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A0=E6=B3=95=E8=AE=B0=E4=BD=8F?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=B3=95=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原因：创建sniTrayWidget的时候使用异步的方式获取sni的id，此时一定是空的，进而无法通过ID获取到正确的位置
解决方案：使用同步的方式获取ID
PS：dbus interface的可用性已经在线程中得到了验证，此时使用同步的方式获取，理论上不会出现阻塞的问题。

Log:
Bug: https://pms.uniontech.com/bug-view-162899.html
Influence: 托盘插件位置
Change-Id: I1283bfa560879cc9202c08e72cc20953c2964e5d
---
 plugins/tray/snitraywidget.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/tray/snitraywidget.cpp b/plugins/tray/snitraywidget.cpp
index f4af4b961..192bc4784 100644
--- a/plugins/tray/snitraywidget.cpp
+++ b/plugins/tray/snitraywidget.cpp
@@ -28,10 +28,10 @@ QPointer<DockPopupWindow> SNITrayWidget::PopupWindow = nullptr;
 Dock::Position SNITrayWidget::DockPosition = Dock::Position::Top;
 using namespace Dock;
 SNITrayWidget::SNITrayWidget(const QString &sniServicePath, QWidget *parent)
-    : AbstractTrayWidget(parent),
-      m_dbusMenuImporter(nullptr),
-      m_menu(nullptr),
-      m_updateIconTimer(new QTimer(this))
+    : AbstractTrayWidget(parent)
+    , m_dbusMenuImporter(nullptr)
+    , m_menu(nullptr)
+    , m_updateIconTimer(new QTimer(this))
     , m_updateOverlayIconTimer(new QTimer(this))
     , m_updateAttentionIconTimer(new QTimer(this))
     , m_sniServicePath(sniServicePath)
@@ -241,12 +241,16 @@ void SNITrayWidget::initSNIPropertys()
     m_sniIconName = m_sniInter->iconName();
     m_sniIconPixmap = m_sniInter->iconPixmap();
     m_sniIconThemePath = m_sniInter->iconThemePath();
-    m_sniId = m_sniInter->id();
     m_sniMenuPath = m_sniInter->menu();
     m_sniOverlayIconName = m_sniInter->overlayIconName();
     m_sniOverlayIconPixmap = m_sniInter->overlayIconPixmap();
     m_sniStatus = m_sniInter->status();
 
+    // 使用同步的方式获取id，否则在插入的时候无法获取正确的位置
+    m_sniInter->setSync(true);
+    m_sniId = m_sniInter->id();
+    m_sniInter->setSync(false);
+
     m_updateIconTimer->start();
 //    m_updateOverlayIconTimer->start();
 //    m_updateAttentionIconTimer->start();