PySide2-Frameless-Window 0.5.1__tar.gz → 0.7.0__tar.gz

{pyside2_frameless_window-0.5.1 → pyside2_frameless_window-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySide2-Frameless-Window
-Version: 0.5.1
+Version: 0.7.0
 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
@@ -53,6 +53,7 @@ Requires-Dist: PyCocoa; platform_system == "Darwin"
 * Win11 mica blur
 * Win7 Aero blur
 * MacOS blur
+* Disable screen capture
 
 ## Install
 To install use pip:

{pyside2_frameless_window-0.5.1 → pyside2_frameless_window-0.7.0}/PySide2_Frameless_Window.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySide2-Frameless-Window
-Version: 0.5.1
+Version: 0.7.0
 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
@@ -53,6 +53,7 @@ Requires-Dist: PyCocoa; platform_system == "Darwin"
 * Win11 mica blur
 * Win7 Aero blur
 * MacOS blur
+* Disable screen capture
 
 ## Install
 To install use pip:

{pyside2_frameless_window-0.5.1 → pyside2_frameless_window-0.7.0}/README.md

@@ -35,6 +35,7 @@
 * Win11 mica blur
 * Win7 Aero blur
 * MacOS blur
+* Disable screen capture
 
 ## Install
 To install use pip:

{pyside2_frameless_window-0.5.1 → pyside2_frameless_window-0.7.0}/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.5.1"
+__version__ = "0.7.0"
 __author__ = "zhiyiYo"
 
 import sys

{pyside2_frameless_window-0.5.1 → pyside2_frameless_window-0.7.0}/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.5.1 → pyside2_frameless_window-0.7.0}/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.5.1 → pyside2_frameless_window-0.7.0}/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.5.1 → pyside2_frameless_window-0.7.0}/qframelesswindow/utils/__init__.py

@@ -4,12 +4,15 @@ import sys
 if sys.platform == "win32":
     from .win32_utils import WindowsMoveResize as MoveResize
     from .win32_utils import getSystemAccentColor
+    from .win32_utils import WindowsScreenCaptureFilter as ScreenCaptureFilter
 elif sys.platform == "darwin":
     from .mac_utils import MacMoveResize as MoveResize
     from .mac_utils import getSystemAccentColor
+    from .mac_utils import MacScreenCaptureFilter as ScreenCaptureFilter
 else:
     from .linux_utils import LinuxMoveResize as MoveResize
     from .linux_utils import getSystemAccentColor
+    from .linux_utils import LinuxScreenCaptureFilter as ScreenCaptureFilter
 
 
 def startSystemMove(window, globalPos):

{pyside2_frameless_window-0.5.1 → pyside2_frameless_window-0.7.0}/qframelesswindow/utils/linux_utils.py

@@ -1,7 +1,7 @@
 # coding: utf-8
-from PySide2.QtCore import QEvent, QPoint, Qt
+from PySide2.QtCore import QEvent, QPoint, Qt, QObject
 from PySide2.QtGui import QMouseEvent, QColor
-from PySide2.QtWidgets import QApplication
+from PySide2.QtWidgets import QApplication, QWidget
 
 
 class LinuxMoveResize:
@@ -53,4 +53,23 @@ def getSystemAccentColor():
     color: QColor
         accent color
     """
-    return QColor()
+    return QColor()
+
+
+class LinuxScreenCaptureFilter(QObject):
+    """ Filter for screen capture """
+
+    def __init__(self, parent: QWidget):
+        super().__init__(parent)
+        self.setScreenCaptureEnabled(False)
+
+    def eventFilter(self, watched, event):
+        if watched == self.parent():
+            if event.type() == QEvent.Type.WinIdChange:
+                self.setScreenCaptureEnabled(self.isScreenCaptureEnabled)
+
+        return super().eventFilter(watched, event)
+
+    def setScreenCaptureEnabled(self, enabled: bool):
+        """ Set screen capture enabled """
+        self.isScreenCaptureEnabled = enabled

{pyside2_frameless_window-0.5.1 → pyside2_frameless_window-0.7.0}/qframelesswindow/utils/mac_utils.py

@@ -3,7 +3,7 @@ from ctypes import c_void_p
 
 import Cocoa
 import objc
-from PySide2.QtCore import qVersion
+from PySide2.QtCore import qVersion, QEvent, QObject
 from PySide2.QtGui import QColor
 from PySide2.QtWidgets import QWidget
 from Quartz.CoreGraphics import (CGEventCreateMouseEvent,
@@ -86,4 +86,29 @@ def getSystemAccentColor():
     r = int(color.redComponent() * 255)
     g = int(color.greenComponent() * 255)
     b = int(color.blueComponent() * 255)
-    return QColor(r, g, b)
+    return QColor(r, g, b)
+
+
+class MacScreenCaptureFilter(QObject):
+    """ Filter for screen capture """
+
+    def __init__(self, parent: QWidget):
+        super().__init__(parent)
+        self.setScreenCaptureEnabled(False)
+
+    def eventFilter(self, watched, event):
+        if watched == self.parent():
+            if event.type() == QEvent.Type.WinIdChange:
+                self.setScreenCaptureEnabled(self.isScreenCaptureEnabled)
+
+        return super().eventFilter(watched, event)
+
+    def setScreenCaptureEnabled(self, enabled: bool):
+        """ Set screen capture enabled """
+        self.isScreenCaptureEnabled = enabled
+
+        nsWindow = getNSWindow(self.parent().winId())
+        if nsWindow:
+            NSWindowSharingNone = 0
+            NSWindowSharingReadOnly = 1
+            nsWindow.setSharingType_(NSWindowSharingReadOnly if enabled else NSWindowSharingNone)

{pyside2_frameless_window-0.5.1 → pyside2_frameless_window-0.7.0}/qframelesswindow/utils/win32_utils.py

@@ -1,16 +1,18 @@
 # coding:utf-8
-from ctypes import Structure, byref, sizeof, windll, c_ulong, c_bool, POINTER
-from ctypes.wintypes import DWORD, HWND, LPARAM, RECT, UINT
-from platform import platform
 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
+from winreg import OpenKey, HKEY_CURRENT_USER, KEY_READ, QueryValueEx, CloseKey
 
 import win32api
 import win32con
 import win32gui
 import win32print
-from PySide2.QtCore import QOperatingSystemVersion, QVersionNumber
+from PySide2.QtCore import QOperatingSystemVersion, QObject, QEvent, QVersionNumber
 from PySide2.QtGui import QGuiApplication, QColor
+from PySide2.QtWidgets import QWidget
 from PySide2.QtWinExtras import QtWin
 from win32comext.shell import shellcon
 
@@ -37,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
 
@@ -337,3 +354,31 @@ class WindowsMoveResize:
             window edges
         """
         pass
+
+
+class WindowsScreenCaptureFilter(QObject):
+    """ Filter for screen capture """
+
+    def __init__(self, parent: QWidget):
+        super().__init__(parent)
+        self.setScreenCaptureEnabled(False)
+
+    def eventFilter(self, watched, event):
+        if watched == self.parent():
+            if event.type() == QEvent.Type.WinIdChange:
+                self.setScreenCaptureEnabled(self.isScreenCaptureEnabled)
+
+        return super().eventFilter(watched, event)
+
+    def setScreenCaptureEnabled(self, enabled: bool):
+        """ Set screen capture enabled """
+        self.isScreenCaptureEnabled = enabled
+        WDA_NONE = 0x00000000
+        WDA_EXCLUDEFROMCAPTURE = 0x00000011
+
+        user32 = WinDLL('user32', use_last_error=True)
+        SetWindowDisplayAffinity = user32.SetWindowDisplayAffinity
+        SetWindowDisplayAffinity.argtypes = (wintypes.HWND, wintypes.DWORD)
+        SetWindowDisplayAffinity.restype = wintypes.BOOL
+
+        SetWindowDisplayAffinity(int(self.parent().winId()), WDA_NONE if enabled else WDA_EXCLUDEFROMCAPTURE)

{pyside2_frameless_window-0.5.1 → pyside2_frameless_window-0.7.0}/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
 
@@ -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.5.1 → pyside2_frameless_window-0.7.0}/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.5.1 → pyside2_frameless_window-0.7.0}/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.5.1 → pyside2_frameless_window-0.7.0}/setup.py

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