修复拖动窗口到不同显示器后 UI 不符合预期的问题 (#553)

Zzaphkiel · Dec 10, 2024 · d4e257a · d4e257a
1 parent f8a5860
commit d4e257a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/app/view/main_window.py b/app/view/main_window.py
@@ -11,7 +11,7 @@
 import asyncio
 from aiohttp.client_exceptions import ClientConnectorError
 from qasync import asyncClose, asyncSlot
-from PyQt5.QtCore import Qt, pyqtSignal, QSize
+from PyQt5.QtCore import Qt, pyqtSignal, QSize, QEvent
 from PyQt5.QtGui import QIcon, QImage
 from PyQt5.QtWidgets import QApplication, QSystemTrayIcon
 
@@ -101,6 +101,8 @@ def __init__(self):
         self.lastTipsTime = time.time()
         self.lastTipsType = None
 
+        self.isDragging = False
+
         self.__initInterface()
         self.__initNavigation()
         self.__initListener()
@@ -1037,3 +1039,10 @@ def exceptHook(self, ty, value, tb):
     def __onCurrentStackedChanged(self, index):
         widget: SmoothScrollArea = self.stackedWidget.view.currentWidget()
         widget.delegate.vScrollBar.resetValue(0)
+
+    def eventFilter(self, obj, e: QEvent):
+        # Fix #553
+        if e.type() == QEvent.Type.MouseButtonRelease:
+            self.adjustSize()
+
+        return super().eventFilter(obj, e)
diff --git a/app/view/opgg_window.py b/app/view/opgg_window.py
@@ -4,7 +4,7 @@
 
 from qasync import asyncSlot, asyncClose
 from PyQt5.QtGui import QColor, QPainter, QIcon, QShowEvent
-from PyQt5.QtCore import Qt, pyqtSignal, QSize, QRect
+from PyQt5.QtCore import Qt, pyqtSignal, QSize, QRect, QEvent
 from PyQt5.QtWidgets import (QHBoxLayout, QStackedWidget, QWidget, QLabel,
                              QFrame, QVBoxLayout, QSpacerItem, QSizePolicy,
                              QApplication)
@@ -499,7 +499,7 @@ def showEvent(self, a0: QShowEvent) -> None:
         dpi = self.devicePixelRatioF()
         x = pos.right()
         y = pos.center().y() - size.height() * dpi / 2
-        rect = QRect( int(x / dpi), int(y / dpi), size.width(), size.height())
+        rect = QRect(int(x / dpi), int(y / dpi), size.width(), size.height())
 
         # 如果超出右边界，则直接 return 了
         screenWidth = win32api.GetSystemMetrics(0)
@@ -522,6 +522,13 @@ def setHomeInterfaceEnabled(self, enabeld):
         interface = self.homeInterface if enabeld else self.tierInterface
         self.stackedWidget.setCurrentWidget(interface)
 
+    def eventFilter(self, obj, e: QEvent):
+        # Fix #553
+        if e.type() == QEvent.Type.MouseButtonRelease:
+            self.adjustSize()
+
+        return super().eventFilter(obj, e)
+
 
 class WaitingInterface(QFrame):
     def __init__(self, parent: QWidget = None):