PySide2-Frameless-Window 0.6.0__tar.gz → 0.7.2__tar.gz

{pyside2_frameless_window-0.6.0 → pyside2_frameless_window-0.7.2}/PKG-INFO

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

{pyside2_frameless_window-0.6.0 → pyside2_frameless_window-0.7.2}/PySide2_Frameless_Window.egg-info/PKG-INFO

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

{pyside2_frameless_window-0.6.0 → pyside2_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: LGPLv3, see LICENSE for more details.
 """
 
-__version__ = "0.6.0"
+__version__ = "0.7.2"
 __author__ = "zhiyiYo"
 
 import sys

{pyside2_frameless_window-0.6.0 → pyside2_frameless_window-0.7.2}/qframelesswindow/linux/window_effect.py

@@ -1,4 +1,6 @@
 # coding:utf-8
+from PySide2.QtGui import QColor
+
 
 class LinuxWindowEffect:
     """ Linux window effect """
@@ -25,6 +27,29 @@ class LinuxWindowEffect:
         """
         pass
 
+    def setBorderAccentColor(self, hWnd, color: QColor):
+        """ Set the border color of the window
+
+        Parameters
+        ----------
+        hWnd: int or `sip.voidptr`
+            Window handle
+
+        color: QColor
+            Border Accent color
+        """
+        pass
+
+    def removeBorderAccentColor(self, hWnd):
+        """ Remove the border color of the window
+
+        Parameters
+        ----------
+        hWnd: int or `sip.voidptr`
+            Window handle
+        """
+        pass
+
     def setMicaEffect(self, hWnd, isDarkMode=False, isAlt=False):
         """ Add mica effect to the window (Win11 only)
 

{pyside2_frameless_window-0.6.0 → pyside2_frameless_window-0.7.2}/qframelesswindow/mac/window_effect.py

@@ -2,7 +2,7 @@
 import Cocoa
 from PySide2.QtCore import Qt
 from PySide2.QtWidgets import QWidget
-
+from PySide2.QtGui import QColor
 from ..utils.mac_utils import getNSWindow
 
 
@@ -55,6 +55,29 @@ class MacWindowEffect:
         content.addSubview_positioned_relativeTo_(
             visualEffectView, Cocoa.NSWindowBelow, container)
 
+    def setBorderAccentColor(self, hWnd, color: QColor):
+        """ Set the border color of the window
+
+        Parameters
+        ----------
+        hWnd: int or `sip.voidptr`
+            Window handle
+
+        color: QColor
+            Border Accent color
+        """
+        pass
+
+    def removeBorderAccentColor(self, hWnd):
+        """ Remove the border color of the window
+
+        Parameters
+        ----------
+        hWnd: int or `sip.voidptr`
+            Window handle
+        """
+        pass
+
     def setMicaEffect(self, hWnd, isDarkMode=False, isAlt=False):
         """ Add mica effect to the window (Win11 only)
 

{pyside2_frameless_window-0.6.0 → pyside2_frameless_window-0.7.2}/qframelesswindow/titlebar/__init__.py

@@ -131,7 +131,7 @@ class StandardTitleBar(TitleBar):
         self.titleLabel.setStyleSheet("""
             QLabel{
                 background: transparent;
-                font: 13px 'Segoe UI';
+                font: 13px 'Segoe UI', 'Microsoft YaHei', 'PingFang SC';
                 padding: 0 4px
             }
         """)

{pyside2_frameless_window-0.6.0 → pyside2_frameless_window-0.7.2}/qframelesswindow/utils/win32_utils.py

@@ -1,9 +1,10 @@
 # coding:utf-8
+import sys
+import warnings
 from ctypes import Structure, byref, sizeof, windll, c_ulong, c_bool, POINTER, WinDLL, wintypes
 from ctypes.wintypes import DWORD, HWND, LPARAM, RECT, UINT
 from platform import platform
-import sys
-import warnings
+from winreg import OpenKey, HKEY_CURRENT_USER, KEY_READ, QueryValueEx, CloseKey
 
 import win32api
 import win32con
@@ -38,6 +39,21 @@ def getSystemAccentColor():
     return QColor(color.value)
 
 
+def isSystemBorderAccentEnabled():
+    """ Check whether the border accent is enabled """
+    if not isGreaterEqualWin11():
+        return False
+
+    try:
+        key = OpenKey(HKEY_CURRENT_USER, r"SOFTWARE\Microsoft\Windows\DWM", 0, KEY_READ)
+        value, _ = QueryValueEx(key, "ColorPrevalence")
+        CloseKey(key)
+
+        return bool(value)
+    except:
+        return False
+
+
 def isMaximized(hWnd):
     """ Determine whether the window is maximized
 

{pyside2_frameless_window-0.6.0 → pyside2_frameless_window-0.7.2}/qframelesswindow/windows/__init__.py

@@ -13,7 +13,7 @@ from PySide2.QtWinExtras import QtWin
 
 from ..titlebar import TitleBar
 from ..utils import win32_utils as win_utils
-from ..utils.win32_utils import Taskbar
+from ..utils.win32_utils import Taskbar, isSystemBorderAccentEnabled, getSystemAccentColor
 from .c_structures import LPNCCALCSIZE_PARAMS
 from .window_effect import WindowsWindowEffect
 
@@ -121,18 +121,18 @@ class WindowsFramelessWindow(QWidget):
             return super().nativeEvent(eventType, message)
 
         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:
@@ -182,6 +182,12 @@ class WindowsFramelessWindow(QWidget):
 
             result = 0 if not msg.wParam else win32con.WVR_REDRAW
             return True, result
+        elif msg.message == win32con.WM_SETFOCUS and isSystemBorderAccentEnabled():
+            self.windowEffect.setBorderAccentColor(self.winId(), getSystemAccentColor())
+            return True, 0
+        elif msg.message == win32con.WM_KILLFOCUS:
+            self.windowEffect.removeBorderAccentColor(self.winId())
+            return True, 0
 
         return super().nativeEvent(eventType, message)
 

{pyside2_frameless_window-0.6.0 → pyside2_frameless_window-0.7.2}/qframelesswindow/windows/c_structures.py

@@ -94,13 +94,14 @@ class DWMWINDOWATTRIBUTE(Enum):
     DWMWA_FREEZE_REPRESENTATION = 15
     DWMWA_PASSIVE_UPDATE_MODE = 16
     DWMWA_USE_HOSTBACKDROPBRUSH = 17
-    DWMWA_USE_IMMERSIVE_DARK_MODE = 18
-    DWMWA_WINDOW_CORNER_PREFERENCE = 19
-    DWMWA_BORDER_COLOR = 20
-    DWMWA_CAPTION_COLOR = 21
-    DWMWA_TEXT_COLOR = 22
-    DWMWA_VISIBLE_FRAME_BORDER_THICKNESS = 23
-    DWMWA_LAST = 24
+    DWMWA_USE_IMMERSIVE_DARK_MODE = 20
+    DWMWA_WINDOW_CORNER_PREFERENCE = 33
+    DWMWA_BORDER_COLOR = 34
+    DWMWA_CAPTION_COLOR = 35
+    DWMWA_TEXT_COLOR = 36
+    DWMWA_VISIBLE_FRAME_BORDER_THICKNESS = 37
+    DWMWA_SYSTEMBACKDROP_TYPE = 38
+    DWMWA_LAST = 39
 
 
 class MARGINS(Structure):

{pyside2_frameless_window-0.6.0 → pyside2_frameless_window-0.7.2}/qframelesswindow/windows/window_effect.py

@@ -8,6 +8,7 @@ import win32api
 import win32con
 import win32gui
 from PySide2.QtWinExtras import QtWin
+from PySide2.QtGui import QColor
 
 from .c_structures import (ACCENT_POLICY, ACCENT_STATE, DWMNCRENDERINGPOLICY,
                            DWMWINDOWATTRIBUTE, MARGINS,
@@ -78,6 +79,44 @@ class WindowsWindowEffect:
         self.winCompAttrData.Attribute = WINDOWCOMPOSITIONATTRIB.WCA_ACCENT_POLICY.value
         self.SetWindowCompositionAttribute(hWnd, pointer(self.winCompAttrData))
 
+    def setBorderAccentColor(self, hWnd, color: QColor):
+        """ Set the border color of the window
+
+        Parameters
+        ----------
+        hWnd: int or `sip.voidptr`
+            Window handle
+
+        color: QColor
+            Border Accent color
+        """
+        if not isGreaterEqualWin11():
+            return
+
+        hWnd = int(hWnd)
+        colorref =  DWORD(color.red() | (color.green() << 8) | (color.blue() << 16))
+        self.DwmSetWindowAttribute(hWnd,
+                                   DWMWINDOWATTRIBUTE.DWMWA_BORDER_COLOR.value,
+                                   byref(colorref),
+                                   4)
+
+    def removeBorderAccentColor(self, hWnd):
+        """ Remove the border color of the window
+
+        Parameters
+        ----------
+        hWnd: int or `sip.voidptr`
+            Window handle
+        """
+        if not isGreaterEqualWin11():
+            return
+
+        hWnd = int(hWnd)
+        self.DwmSetWindowAttribute(hWnd,
+                                   DWMWINDOWATTRIBUTE.DWMWA_BORDER_COLOR.value,
+                                   byref(DWORD(0xFFFFFFFF)),
+                                   4)
+
     def setMicaEffect(self, hWnd, isDarkMode=False, isAlt=False):
         """ Add the mica effect to the window (Win11 only)
 
@@ -97,7 +136,8 @@ class WindowsWindowEffect:
             return
 
         hWnd = int(hWnd)
-        margins = MARGINS(-1, -1, -1, -1)
+        # fix issue #125
+        margins = MARGINS(16777215, 16777215, 0, 0)
         self.DwmExtendFrameIntoClientArea(hWnd, byref(margins))
 
         self.winCompAttrData.Attribute = WINDOWCOMPOSITIONATTRIB.WCA_ACCENT_POLICY.value
@@ -111,9 +151,9 @@ class WindowsWindowEffect:
         if sys.getwindowsversion().build < 22523:
             self.DwmSetWindowAttribute(hWnd, 1029, byref(c_int(1)), 4)
         else:
-            self.DwmSetWindowAttribute(hWnd, 38, byref(c_int(4 if isAlt else 2)), 4)
+            self.DwmSetWindowAttribute(hWnd, DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE.value, byref(c_int(4 if isAlt else 2)), 4)
 
-        self.DwmSetWindowAttribute(hWnd, 20, byref(c_int(1*isDarkMode)), 4)
+        self.DwmSetWindowAttribute(hWnd, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE.value, byref(c_int(1*isDarkMode)), 4)
 
     def setAeroEffect(self, hWnd):
         """ Add the aero effect to the window

{pyside2_frameless_window-0.6.0 → pyside2_frameless_window-0.7.2}/setup.py

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