From 02ca9fd6ef0b5668516f8dc6882d381499d0ec5a Mon Sep 17 00:00:00 2001
From: WLYYL <572670047@qq.com>
Date: Sun, 19 Dec 2021 21:58:31 +0800
Subject: [PATCH 1/2] Update windowsmanager.cpp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

取消显示雷神窗口时的动画
调整 当雷神终端在不是当前激活界面，快捷键不聚焦到雷神终端，而是直接隐藏
---
 src/main/windowsmanager.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/windowsmanager.cpp b/src/main/windowsmanager.cpp
index a50ede573..50ee0b3e9 100644
--- a/src/main/windowsmanager.cpp
+++ b/src/main/windowsmanager.cpp
@@ -41,7 +41,7 @@ void WindowsManager::runQuakeWindow(TermProperties properties)
         m_quakeWindow->setAnimationFlag(false);
         m_quakeWindow->show();
         //Add by ut001000 renfeixiang 2020-11-16 开始从上到下的动画
-        m_quakeWindow->topToBottomAnimation();
+        //m_quakeWindow->topToBottomAnimation();
         m_quakeWindow->activateWindow();
         // 雷神创建的第一个时候，m_quakeWindow仍为null，需要在这里更正一下．
         Service::instance()->updateShareMemoryCount(m_quakeWindow == nullptr ? m_widgetCount : m_widgetCount - 1);
@@ -57,7 +57,7 @@ void WindowsManager::quakeWindowShowOrHide()
     if (!m_quakeWindow->isVisible()) {
         m_quakeWindow->setAnimationFlag(false);
         m_quakeWindow->show();
-        m_quakeWindow->topToBottomAnimation();
+        //m_quakeWindow->topToBottomAnimation();
         m_quakeWindow->activateWindow();
         return;
     }
@@ -85,11 +85,11 @@ void WindowsManager::quakeWindowShowOrHide()
         return;
     }
     //终端未激活则激活
-    if(!m_quakeWindow->isActiveWindow()) {
-        m_quakeWindow->activateWindow();
-        m_quakeWindow->focusCurrentPage();
-        return;
-    }
+//     if(!m_quakeWindow->isActiveWindow()) {
+//         m_quakeWindow->activateWindow();
+//         m_quakeWindow->focusCurrentPage();
+//         return;
+//     }
     //隐藏终端
     m_quakeWindow->hideQuakeWindow();
 }

From 726dfa1413f77cdc7d0b4bc966f2a57dd2801ffe Mon Sep 17 00:00:00 2001
From: WLYYL <572670047@qq.com>
Date: Mon, 20 Dec 2021 15:26:19 +0800
Subject: [PATCH 2/2] Revert "Update windowsmanager.cpp"

---
 src/main/windowsmanager.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/windowsmanager.cpp b/src/main/windowsmanager.cpp
index 50ee0b3e9..a50ede573 100644
--- a/src/main/windowsmanager.cpp
+++ b/src/main/windowsmanager.cpp
@@ -41,7 +41,7 @@ void WindowsManager::runQuakeWindow(TermProperties properties)
         m_quakeWindow->setAnimationFlag(false);
         m_quakeWindow->show();
         //Add by ut001000 renfeixiang 2020-11-16 开始从上到下的动画
-        //m_quakeWindow->topToBottomAnimation();
+        m_quakeWindow->topToBottomAnimation();
         m_quakeWindow->activateWindow();
         // 雷神创建的第一个时候，m_quakeWindow仍为null，需要在这里更正一下．
         Service::instance()->updateShareMemoryCount(m_quakeWindow == nullptr ? m_widgetCount : m_widgetCount - 1);
@@ -57,7 +57,7 @@ void WindowsManager::quakeWindowShowOrHide()
     if (!m_quakeWindow->isVisible()) {
         m_quakeWindow->setAnimationFlag(false);
         m_quakeWindow->show();
-        //m_quakeWindow->topToBottomAnimation();
+        m_quakeWindow->topToBottomAnimation();
         m_quakeWindow->activateWindow();
         return;
     }
@@ -85,11 +85,11 @@ void WindowsManager::quakeWindowShowOrHide()
         return;
     }
     //终端未激活则激活
-//     if(!m_quakeWindow->isActiveWindow()) {
-//         m_quakeWindow->activateWindow();
-//         m_quakeWindow->focusCurrentPage();
-//         return;
-//     }
+    if(!m_quakeWindow->isActiveWindow()) {
+        m_quakeWindow->activateWindow();
+        m_quakeWindow->focusCurrentPage();
+        return;
+    }
     //隐藏终端
     m_quakeWindow->hideQuakeWindow();
 }