From 3ec6ffffda7e9ff875d3ca36e7a71cee3a159277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E6=9C=8B=E7=A8=8B?= <fanpengcheng@uniontech.com>
Date: Sun, 17 Jul 2022 09:30:04 +0800
Subject: [PATCH] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=EF=BC=8C=E6=96=B9=E4=BE=BF=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加一些日志，方便调试

Log: 添加一些日志，方便调试
Influence: 添加一些日志，方便调试
Change-Id: If57c7746509316f4b4ab3431a674946c6ff32c48
---
 frame/util/multiscreenworker.cpp | 16 +++++++++-------
 frame/util/multiscreenworker.h   |  2 ++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/frame/util/multiscreenworker.cpp b/frame/util/multiscreenworker.cpp
index fbb617d98..790ce0087 100644
--- a/frame/util/multiscreenworker.cpp
+++ b/frame/util/multiscreenworker.cpp
@@ -354,9 +354,8 @@ void MultiScreenWorker::onPositionChanged(const Position &position)
     Position lastPos = m_position;
     if (lastPos == position)
         return;
-#ifdef QT_DEBUG
-    qDebug() << "position change from: " << lastPos << " to: " << position;
-#endif
+
+    qInfo() << "position changed from: " << lastPos << " to: " << position;
     m_position = position;
 
     // 更新鼠标拖拽样式，在类内部设置到qApp单例上去
@@ -384,7 +383,7 @@ void MultiScreenWorker::onDisplayModeChanged(const DisplayMode &displayMode)
     if (displayMode == m_displayMode)
         return;
 
-    qInfo() << "display mode change:" << displayMode;
+    qInfo() << "display mode changed:" << displayMode;
 
     m_displayMode = displayMode;
 
@@ -415,7 +414,7 @@ void MultiScreenWorker::onHideModeChanged(const HideMode &hideMode)
     if (m_hideMode == hideMode)
         return;
 
-    qInfo() << "hidemode change:" << hideMode;
+    qInfo() << "hidemode changed:" << hideMode;
 
     m_hideMode = hideMode;
 
@@ -446,7 +445,7 @@ void MultiScreenWorker::onHideStateChanged(const Dock::HideState &state)
         m_ds.updateDockedScreen(getValidScreen(m_position));
     }
 
-    qInfo() << "hidestate change:" << m_hideMode << m_hideState;
+    qInfo() << "hidestate changed:" << m_hideMode << m_hideState;
 
     if (m_hideMode == HideMode::KeepShowing
             || ((m_hideMode == HideMode::KeepHidden || m_hideMode == HideMode::SmartHide) && m_hideState == HideState::Show)) {
@@ -455,13 +454,15 @@ void MultiScreenWorker::onHideStateChanged(const Dock::HideState &state)
         // 如果鼠标正在任务栏要显示的区域,就可以不用隐藏(相当于智能隐藏被唤醒一样)
         if (getDockShowGeometry(m_ds.current(), m_position, m_displayMode).contains(QCursor::pos()))
             return;
+
         displayAnimation(m_ds.current(), AniAction::Hide);
     }
 }
 
 void MultiScreenWorker::onOpacityChanged(const double value)
 {
-    if (int(m_opacity * 100) == int(value * 100)) return;
+    if (int(m_opacity * 100) == int(value * 100))
+        return;
 
     m_opacity = value;
 
@@ -1298,6 +1299,7 @@ void MultiScreenWorker::resetDockScreen()
       */
     parent()->setFixedSize(dockRect(m_ds.current()).size());
     parent()->setGeometry(dockRect(m_ds.current()));
+    qDebug() << "update dock geometry: " << dockRect(m_ds.current());
     parent()->panel()->setFixedSize(dockRect(m_ds.current()).size());
     parent()->panel()->move(0, 0);
 }
diff --git a/frame/util/multiscreenworker.h b/frame/util/multiscreenworker.h
index 520bfb37b..adf1c3d26 100644
--- a/frame/util/multiscreenworker.h
+++ b/frame/util/multiscreenworker.h
@@ -35,6 +35,7 @@
 
 #include <QObject>
 #include <QFlag>
+#include <QDebug>
 
 #define WINDOWMARGIN ((m_displayMode == Dock::Efficient) ? 0 : 10)
 #define ANIMATIONTIME 300
@@ -79,6 +80,7 @@ public:
 
     void updateDockedScreen(const QString &screenName)
     {
+        qInfo() << "update docked screen" << screenName;
         m_lastScreen = m_currentScreen;
         m_currentScreen = screenName;
     }