PyQt6-Frameless-Window 0.7.0__tar.gz → 0.7.2__tar.gz

{pyqt6_frameless_window-0.7.0 → pyqt6_frameless_window-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyQt6-Frameless-Window
-Version: 0.7.0
+Version: 0.7.2
 Summary: A cross-platform frameless window based on pyqt6, support Win32, Linux and macOS.
 Home-page: https://github.com/zhiyiYo/PyQt-Frameless-Window/tree/PyQt6
 Author: zhiyiYo

{pyqt6_frameless_window-0.7.0 → pyqt6_frameless_window-0.7.2}/PyQt6_Frameless_Window.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyQt6-Frameless-Window
-Version: 0.7.0
+Version: 0.7.2
 Summary: A cross-platform frameless window based on pyqt6, support Win32, Linux and macOS.
 Home-page: https://github.com/zhiyiYo/PyQt-Frameless-Window/tree/PyQt6
 Author: zhiyiYo

{pyqt6_frameless_window-0.7.0 → pyqt6_frameless_window-0.7.2}/qframelesswindow/__init__.py

@@ -12,7 +12,7 @@ Examples are available at https://github.com/zhiyiYo/PyQt-Frameless-Window/tree/
 :license: GPLv3, see LICENSE for more details.
 """
 
-__version__ = "0.7.0"
+__version__ = "0.7.2"
 __author__ = "zhiyiYo"
 
 import sys

{pyqt6_frameless_window-0.7.0 → pyqt6_frameless_window-0.7.2}/qframelesswindow/titlebar/__init__.py

@@ -5,7 +5,7 @@ from PyQt6.QtCore import Qt, QEvent
 from PyQt6.QtGui import QIcon
 from PyQt6.QtWidgets import QLabel, QHBoxLayout, QWidget
 
-from ..utils import startSystemMove
+from ..utils import startSystemMove, toggleMaxState
 from .title_bar_buttons import (CloseButton, MaximizeButton, MinimizeButton,
                                 SvgTitleBarButton, TitleBarButton)
 
@@ -60,14 +60,7 @@ class TitleBarBase(QWidget):
 
     def __toggleMaxState(self):
         """ Toggles the maximization state of the window and change icon """
-        if self.window().isMaximized():
-            self.window().showNormal()
-        else:
-            self.window().showMaximized()
-            
-        if sys.platform == "win32":
-            from ..utils.win32_utils import releaseMouseLeftButton
-            releaseMouseLeftButton(self.window().winId())
+        toggleMaxState(self.window())
 
     def _isDragRegion(self, pos):
         """ Check whether the position belongs to the area where dragging is allowed """

{pyqt6_frameless_window-0.7.0 → pyqt6_frameless_window-0.7.2}/qframelesswindow/utils/__init__.py

@@ -29,6 +29,17 @@ def startSystemMove(window, globalPos):
     MoveResize.startSystemMove(window, globalPos)
 
 
+def toggleMaxState(window):
+    """toggle maximized state of window
+
+    Parameters
+    ----------
+    window: QWidget
+        the window to be toggled
+    """
+    MoveResize.toggleMaxState(window)
+
+
 def starSystemResize(window, globalPos, edges):
     """ resize window
 

{pyqt6_frameless_window-0.7.0 → pyqt6_frameless_window-0.7.2}/qframelesswindow/utils/linux_utils.py

@@ -29,6 +29,13 @@ class LinuxMoveResize:
         """
         window.windowHandle().startSystemResize(edges)
 
+    @classmethod
+    def toggleMaxState(cls, window):
+        if window.isMaximized():
+            window.showNormal()
+        else:
+            window.showMaximized()
+
 
 def getSystemAccentColor():
     """ get the accent color of system

{pyqt6_frameless_window-0.7.0 → pyqt6_frameless_window-0.7.2}/qframelesswindow/utils/mac_utils.py

@@ -60,6 +60,13 @@ class MacMoveResize:
         """
         pass
 
+    @classmethod
+    def toggleMaxState(cls, window):
+        if window.isMaximized():
+            window.showNormal()
+        else:
+            window.showMaximized()
+
 
 def getNSWindow(winId):
     """ convert window handle to NSWindow

{pyqt6_frameless_window-0.7.0 → pyqt6_frameless_window-0.7.2}/qframelesswindow/utils/win32_utils.py

@@ -10,10 +10,11 @@ import win32api
 import win32con
 import win32gui
 import win32print
-from PyQt6.QtCore import QOperatingSystemVersion, QObject, QEvent
+from PyQt6.QtCore import QOperatingSystemVersion, QObject, QEvent, qVersion
 from PyQt6.QtGui import QGuiApplication, QColor
 from PyQt6.QtWidgets import QWidget
 from win32comext.shell import shellcon
+QT_VERSION = tuple(int(v) for v in qVersion().split('.'))
 
 
 def getSystemAccentColor():
@@ -369,6 +370,21 @@ class WindowsMoveResize:
         """
         pass
 
+    @classmethod
+    def toggleMaxState(cls, window):
+        if QT_VERSION < (6, 8, 0):
+            if window.isMaximized():
+                window.showNormal()
+            else:
+                window.showMaximized()
+        else:
+            if window.isMaximized():
+                win32gui.PostMessage(int(window.winId()), win32con.WM_SYSCOMMAND, win32con.SC_RESTORE, 0)
+            else:
+                win32gui.PostMessage(int(window.winId()), win32con.WM_SYSCOMMAND, win32con.SC_MAXIMIZE, 0)
+
+        releaseMouseLeftButton(window.winId())
+
 
 class WindowsScreenCaptureFilter(QObject):
     """ Filter for screen capture """

{pyqt6_frameless_window-0.7.0 → pyqt6_frameless_window-0.7.2}/qframelesswindow/windows/__init__.py

@@ -116,18 +116,18 @@ class WindowsFramelessWindow(QWidget):
             return False, 0
 
         if msg.message == win32con.WM_NCHITTEST and self._isResizeEnabled:
-            pos = QCursor.pos()
-            xPos = pos.x() - self.x()
-            yPos = pos.y() - self.y()
-            w = self.frameGeometry().width()
-            h = self.frameGeometry().height()
+            xPos, yPos = win32gui.ScreenToClient(msg.hWnd, (msg.lParam & 65535, msg.lParam >> 16))
+            clientRect = win32gui.GetClientRect(msg.hWnd)
+
+            w = clientRect[2] - clientRect[0]
+            h = clientRect[3] - clientRect[1]
 
             # fixes https://github.com/zhiyiYo/PyQt-Frameless-Window/issues/98
             bw = 0 if win_utils.isMaximized(msg.hWnd) or win_utils.isFullScreen(msg.hWnd) else self.BORDER_WIDTH
-            lx = xPos < bw
-            rx = xPos > w - bw
-            ty = yPos < bw
-            by = yPos > h - bw
+            lx = xPos < bw  # left
+            rx = xPos > w - bw  # right
+            ty = yPos < bw  # top
+            by = yPos > h - bw  # bottom
             if lx and ty:
                 return True, win32con.HTTOPLEFT
             elif rx and by:

{pyqt6_frameless_window-0.7.0 → pyqt6_frameless_window-0.7.2}/setup.py

@@ -6,7 +6,7 @@ with open('README.md', encoding='utf-8') as f:
 
 setuptools.setup(
     name="PyQt6-Frameless-Window",
-    version="0.7.0",
+    version="0.7.2",
     keywords="pyqt6 frameless",
     author="zhiyiYo",
     author_email="shokokawaii@outlook.com",