From 696432d0d27beae4afec8a8f078fc939ca9d56d1 Mon Sep 17 00:00:00 2001
From: YinJie <yinjie@uniontech.com>
Date: Thu, 22 Sep 2022 17:32:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=B6=E5=B0=9A=E6=A8=A1=E5=BC=8Fstru?=
 =?UTF-8?q?t=E8=AE=BE=E7=BD=AE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

wayland环境下计算时尚模式的strut时没有加上 margin，导致应用最大化的时候与任务栏区域有重叠

Log: 修复时尚模式应用最大化与任务栏有重叠区域的问题
Bug: https://pms.uniontech.com/bug-view-157187.html
Influence: 任务栏时尚模式
Change-Id: I23dfdb44ce96358d96fc289ca19bcf49c3d90994
---
 frame/util/multiscreenworker.cpp | 9 +++++++--
 frame/util/multiscreenworker.h   | 1 -
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frame/util/multiscreenworker.cpp b/frame/util/multiscreenworker.cpp
index e99766f04..3535ee639 100644
--- a/frame/util/multiscreenworker.cpp
+++ b/frame/util/multiscreenworker.cpp
@@ -25,6 +25,7 @@
 const QString MonitorsSwitchTime = "monitorsSwitchTime";
 const QString OnlyShowPrimary = "onlyShowPrimary";
 
+#define WINDOW_MARGIN ((m_displayMode == Dock::Efficient) ? 0 : 10)
 #define DIS_INS DisplayManager::instance()
 
 // 保证以下数据更新顺序(大环节顺序不要变，内部还有一些小的调整，比如任务栏显示区域更新的时候，里面内容的布局方向可能也要更新...)
@@ -593,7 +594,7 @@ void MultiScreenWorker::onRequestUpdateRegionMonitor()
     }
 
     // 触屏监控高度固定调整为最大任务栏高度100+任务栏与屏幕边缘间距
-    const int monitHeight = 100 + WINDOWMARGIN;
+    const int monitHeight = 100 + WINDOW_MARGIN;
 
     // 任务栏触屏唤起区域
     m_touchRectList.clear();
@@ -812,6 +813,10 @@ void MultiScreenWorker::onRequestNotifyWindowManager()
             break;
         }
 
+        // 加上边距(时尚模式为10+10, 高效模式为0)
+        varList[1] = varList[1].toDouble() + WINDOW_MARGIN * ratio * 2;
+        qDebug() << "Dock strut: " << varList;
+
         if (parent()->windowHandle()->handle()) {
             QGuiApplication::platformNativeInterface()->setWindowProperty(parent()->windowHandle()->handle(),"_d_dwayland_dockstrut", varList);
         }
@@ -857,7 +862,7 @@ void MultiScreenWorker::onRequestNotifyWindowManager()
         }
 
         XcbMisc::instance()->set_strut_partial(static_cast<xcb_window_t>(parent()->winId()), orientation,
-                                               static_cast<uint>(strut + WINDOWMARGIN * ratio), // 设置窗口与屏幕边缘距离，需要乘缩放
+                                               static_cast<uint>(strut + WINDOW_MARGIN * ratio), // 设置窗口与屏幕边缘距离，需要乘缩放
                                                static_cast<uint>(strutStart),                   // 设置任务栏起点坐标（上下为x，左右为y）
                                                static_cast<uint>(strutEnd));                    // 设置任务栏终点坐标（上下为x，左右为y）
     }
diff --git a/frame/util/multiscreenworker.h b/frame/util/multiscreenworker.h
index 80a96de7a..af1d2439c 100644
--- a/frame/util/multiscreenworker.h
+++ b/frame/util/multiscreenworker.h
@@ -18,7 +18,6 @@
 #include <QFlag>
 #include <QDebug>
 
-#define WINDOWMARGIN ((m_displayMode == Dock::Efficient) ? 0 : 10)
 #define ANIMATIONTIME 300
 #define FREE_POINT(p) if (p) {\
         delete p;\