From 8cf5d61469e2cc02c430d7fe312d12a1178ea298 Mon Sep 17 00:00:00 2001
From: donghualin <donghualin@uniontech.com>
Date: Thu, 2 Feb 2023 15:40:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=A0=8F=E4=BD=8D=E7=BD=AE=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96?=
 =?UTF-8?q?=E5=90=8E=E6=B6=88=E6=81=AF=E4=B8=8D=E8=B7=9F=E9=9A=8F=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

任务栏位置发生变化的信号中增加参数，方便osd正确识别到该信号来改变提示消息的位置

Log: 修复任务栏位置发生变化后消息不跟随的问题
Influence: 多屏幕下，任务栏跟随鼠标，任务栏在主副屏幕切换的时候，观察消息是否跟随任务栏位置显示
Bug: https://pms.uniontech.com/bug-view-184231.html
Change-Id: I7bfcc134daf6d0c61d435e870da9e098043e5ba8
---
 src/modules/dock/dbusadaptordock.h | 2 +-
 src/modules/dock/dock.cpp          | 2 +-
 src/modules/dock/dock.h            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/dock/dbusadaptordock.h b/src/modules/dock/dbusadaptordock.h
index cbb9679..b1e98ec 100644
--- a/src/modules/dock/dbusadaptordock.h
+++ b/src/modules/dock/dbusadaptordock.h
@@ -216,7 +216,7 @@ Q_SIGNALS: // SIGNALS
     void DisplayModeChanged(int value) const;
     void DockedAppsChanged(const QStringList &value) const;
     void EntriesChanged(const QList<QDBusObjectPath> &value) const;
-    void FrontendWindowRectChanged() const;
+    void FrontendWindowRectChanged(const QRect &dockRect) const;
     void HideModeChanged(int value) const;
     void HideStateChanged(int value) const;
     void HideTimeoutChanged(uint value) const;
diff --git a/src/modules/dock/dock.cpp b/src/modules/dock/dock.cpp
index 9c59e90..710b492 100644
--- a/src/modules/dock/dock.cpp
+++ b/src/modules/dock/dock.cpp
@@ -501,7 +501,7 @@ void Dock::setFrontendWindowRect(int32_t x, int32_t y, uint width, uint height)
     m_frontendWindowRect.setHeight(height);
     updateHideState(false);
 
-    Q_EMIT frontendWindowRectChanged();
+    Q_EMIT frontendWindowRectChanged(m_frontendWindowRect);
 }
 
 /**
diff --git a/src/modules/dock/dock.h b/src/modules/dock/dock.h
index f30fb52..a4c2d26 100644
--- a/src/modules/dock/dock.h
+++ b/src/modules/dock/dock.h
@@ -155,7 +155,7 @@ Q_SIGNALS:
     void entryAdded(QDBusObjectPath entryObjPath, int index);
     void entryRemoved(QString id);
     void hideStateChanged(int);
-    void frontendWindowRectChanged();
+    void frontendWindowRectChanged(const QRect &dockRect);
     void showRecentChanged(bool);
     void showMultiWindowChanged(bool);