RinUI 0.1.4.1__tar.gz → 0.1.5.2__tar.gz

{rinui-0.1.4.1/RinUI.egg-info → rinui-0.1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RinUI
-Version: 0.1.4.1
+Version: 0.1.5.2
 Summary: A Fluent Design-like UI library for Qt Quick (QML) based on PySide6
 Author-email: RinLit <lintu233_qwq@icloud.com>
 Classifier: Programming Language :: Python :: 3

{rinui-0.1.4.1 → rinui-0.1.5.2}/RinUI/__init__.py

@@ -1,4 +1,4 @@
 from .core import *
 
-__version__ = "0.1.4.1"
+__version__ = "0.1.5.2"
 __author__ = "RinLit"

{rinui-0.1.4.1 → rinui-0.1.5.2}/RinUI/components/Text/SpinBox.qml

@@ -107,7 +107,7 @@ SpinBox {
     // 恢复滚轮调整数值
     WheelHandler {
         id: wheelHandler
-        target: spin
+        target: root
         onWheel: (event) => {
             if (!root.focus) {
                 return; // 如果没有焦点，则不处理滚轮事件

{rinui-0.1.4.1 → rinui-0.1.5.2}/RinUI/core/launcher.py

@@ -1,9 +1,9 @@
-import os
 import sys
 from typing import Union
 
 from PySide6.QtCore import QCoreApplication, QUrl, QObject
 from PySide6.QtGui import QIcon
+from PySide6.QtQuick import QQuickWindow
 from PySide6.QtWidgets import QApplication
 from PySide6.QtQml import QQmlApplicationEngine
 from pathlib import Path
@@ -20,6 +20,7 @@ class RinUIWindow:
         :param qml_path: str or Path, QML file path (eg = "path/to/main.qml")
         """
         super().__init__()
+        self.windows = None
         if hasattr(self, "_initialized") and self._initialized:
             return
 
@@ -54,9 +55,9 @@ class RinUIWindow:
 
         if qml_path is None:
             raise ValueError("QML path must be provided to load the window.")
-        self.qml_path = qml_path
+        self.qml_path = Path(qml_path)
 
-        if os.path.exists(RINUI_PATH):
+        if self.qml_path.exists():
             self.engine.addImportPath(RINUI_PATH)
         else:
             raise FileNotFoundError(f"Cannot find RinUI module: {RINUI_PATH}")
@@ -73,8 +74,10 @@ class RinUIWindow:
 
         # 窗口设置
         self.root_window = self.engine.rootObjects()[0]
+        self.windows = [self.root_window] + self.root_window.findChildren(QQuickWindow)
 
-        self.theme_manager.set_window(self.root_window)
+        for window in self.windows:
+            self.theme_manager.set_window(window)
 
         # 窗口句柄管理
         self._window_handle_setup()
@@ -91,7 +94,7 @@ class RinUIWindow:
 
         from .window import WinEventFilter, WinEventManager
 
-        self.win_event_filter = WinEventFilter(self.root_window)
+        self.win_event_filter = WinEventFilter(self.windows)
         self.win_event_manager = WinEventManager()
 
         app_instance = QApplication.instance()
@@ -106,6 +109,7 @@ class RinUIWindow:
         :return:
         """
         app_instance = QApplication.instance()
+        path = Path(path).as_posix()
         if app_instance:
             app_instance.setWindowIcon(QIcon(path))  # 设置应用程序图标
             self.root_window.setProperty('icon', QUrl.fromLocalFile(path))

{rinui-0.1.4.1 → rinui-0.1.5.2}/RinUI/core/theme.py

@@ -135,8 +135,6 @@ class ThemeManager(QObject):
         except Exception as e:
             print(f"Failed to load config because of {e}, using default config")
 
-        # self.hwnd = None  # 窗口句柄
-
         self.start_listener()
 
     def start_listener(self):

rinui-0.1.5.2/RinUI/core/window.py

@@ -0,0 +1,235 @@
+import platform
+from typing import Optional
+
+from PySide6.QtCore import QAbstractNativeEventFilter, QByteArray, QObject, Slot
+import ctypes
+from ctypes import wintypes
+
+import win32con
+from PySide6.QtQuick import QQuickWindow
+from win32gui import ReleaseCapture, GetWindowPlacement, ShowWindow
+from win32con import SW_MAXIMIZE, SW_RESTORE
+from win32api import SendMessage
+
+from RinUI.core.config import is_windows
+
+# 定义 Windows 类型
+ULONG_PTR = ctypes.c_ulong if ctypes.sizeof(ctypes.c_void_p) == 4 else ctypes.c_ulonglong
+LONG = ctypes.c_long
+
+
+# 自定义结构体 MONITORINFO
+class MONITORINFO(ctypes.Structure):
+    _fields_ = [
+        ('cbSize', wintypes.DWORD),
+        ('rcMonitor', wintypes.RECT),
+        ('rcWork', wintypes.RECT),
+        ('dwFlags', wintypes.DWORD)
+    ]
+
+
+class MSG(ctypes.Structure):
+    _fields_ = [
+        ("hwnd", ctypes.c_void_p),
+        ("message", wintypes.UINT),
+        ("wParam", wintypes.WPARAM),
+        ("lParam", wintypes.LPARAM),
+        ("time", wintypes.DWORD),
+        ("pt", wintypes.POINT),
+    ]
+
+
+user32 = ctypes.windll.user32
+
+# 定义必要的 Windows 常量
+WM_NCCALCSIZE = 0x0083
+WM_NCHITTEST = 0x0084
+WM_SYSCOMMAND = 0x0112
+WM_GETMINMAXINFO = 0x0024
+
+WS_CAPTION = 0x00C00000
+WS_THICKFRAME = 0x00040000
+
+SC_MINIMIZE = 0xF020
+SC_MAXIMIZE = 0xF030
+SC_RESTORE = 0xF120
+
+
+class MINMAXINFO(ctypes.Structure):
+    _fields_ = [
+        ("ptReserved", wintypes.POINT),
+        ("ptMaxSize", wintypes.POINT),
+        ("ptMaxPosition", wintypes.POINT),
+        ("ptMinTrackSize", wintypes.POINT),
+        ("ptMaxTrackSize", wintypes.POINT),
+    ]
+
+
+class WinEventManager(QObject):
+    @Slot(QObject, result=int)
+    def getWindowId(self, window):
+        """获取窗口的句柄"""
+        print(f"GetWindowId: {window.winId()}")
+        return int(window.winId())
+
+    @Slot(int)
+    def dragWindowEvent(self, hwnd: int):
+        """ 在Windows 用原生方法拖动"""
+        if not is_windows() or type(hwnd) is not int or hwnd == 0:
+            print(
+                f"Use Qt method to drag window on: {platform.system()}"
+                if not is_windows() else f"Invalid window handle: {hwnd}"
+            )
+            return
+
+        ReleaseCapture()
+        SendMessage(
+            hwnd,
+            win32con.WM_SYSCOMMAND,
+            win32con.SC_MOVE | win32con.HTCAPTION, 0
+        )
+
+    @Slot(int)
+    def maximizeWindow(self, hwnd):
+        """在Windows上最大化或还原窗口"""
+        if not is_windows() or type(hwnd) is not int or hwnd == 0:
+            print(
+                f"Use Qt method to drag window on: {platform.system()}"
+                if not is_windows() else f"Invalid window handle: {hwnd}"
+            )
+            return
+
+        try:
+            placement = GetWindowPlacement(hwnd)
+            current_state = placement[1]
+
+            if current_state == SW_MAXIMIZE:
+                ShowWindow(hwnd, SW_RESTORE)
+            else:
+                ShowWindow(hwnd, SW_MAXIMIZE)
+
+        except Exception as e:
+            print(f"Error toggling window state: {e}")
+
+
+class WinEventFilter(QAbstractNativeEventFilter):
+    def __init__(self, windows: list):
+        super().__init__()
+        self.windows = windows  # 接受多个窗口
+        self.hwnds = {}  # 用于存储每个窗口的 hwnd
+        self.resize_border = 8
+
+        for window in self.windows:
+            window.visibleChanged.connect(self._on_visible_changed)
+            if window.isVisible():
+                self._init_window_handle(window)
+
+    def _on_visible_changed(self, visible: bool):
+        for window in self.windows:
+            if visible and self.hwnds.get(window) is None:
+                self._init_window_handle(window)
+
+    def _init_window_handle(self, window: QQuickWindow):
+        hwnd = int(window.winId())
+        self.hwnds[window] = hwnd
+        self.set_window_styles(window)
+
+    def set_window_styles(self, window: QQuickWindow):
+        hwnd = self.hwnds.get(window)
+        if hwnd is None:
+            return
+
+        style = user32.GetWindowLongPtrW(hwnd, -16)  # GWL_STYLE
+        style |= WS_CAPTION | WS_THICKFRAME
+        user32.SetWindowLongPtrW(hwnd, -16, style)  # GWL_STYLE
+
+        # 重绘
+        user32.SetWindowPos(hwnd, 0, 0, 0, 0, 0,
+                            0x0002 | 0x0001 | 0x0040)  # SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED
+
+    def nativeEventFilter(self, eventType: QByteArray, message):
+        if eventType != b"windows_generic_MSG":
+            return False, 0
+
+        try:
+            message_addr = int(message)
+        except:
+            buf = memoryview(message)
+            message_addr = ctypes.addressof(ctypes.c_char.from_buffer(buf))
+
+        # 直接使用内存地址访问 MSG 字段
+        hwnd = ctypes.c_void_p.from_address(message_addr).value
+        message_id = wintypes.UINT.from_address(message_addr + ctypes.sizeof(ctypes.c_void_p)).value
+        wParam = wintypes.WPARAM.from_address(message_addr + 2 * ctypes.sizeof(ctypes.c_void_p)).value
+        lParam = wintypes.LPARAM.from_address(message_addr + 3 * ctypes.sizeof(ctypes.c_void_p)).value
+
+        # 遍历每个窗口，检查哪个窗口收到了消息
+        for window in self.windows:
+            hwnd_window = self.hwnds.get(window)
+            if hwnd_window == hwnd:
+                if message_id == WM_NCHITTEST:
+                    x = ctypes.c_short(lParam & 0xFFFF).value
+                    y = ctypes.c_short((lParam >> 16) & 0xFFFF).value
+
+                    rect = wintypes.RECT()
+                    user32.GetWindowRect(hwnd_window, ctypes.byref(rect))
+                    left, top, right, bottom = rect.left, rect.top, rect.right, rect.bottom
+                    border = self.resize_border
+
+                    if left <= x < left + border:
+                        if top <= y < top + border:
+                            return True, 13  # HTTOPLEFT
+                        elif bottom - border <= y < bottom:
+                            return True, 16  # HTBOTTOMLEFT
+                        else:
+                            return True, 10  # HTLEFT
+                    elif right - border <= x < right:
+                        if top <= y < top + border:
+                            return True, 14  # HTTOPRIGHT
+                        elif bottom - border <= y < bottom:
+                            return True, 17  # HTBOTTOMRIGHT
+                        else:
+                            return True, 11  # HTRIGHT
+                    elif top <= y < top + border:
+                        return True, 12  # HTTOP
+                    elif bottom - border <= y < bottom:
+                        return True, 15  # HTBOTTOM
+
+                    # 其他区域不处理
+                    return False, 0
+
+                # 移除标题栏
+                elif message_id == WM_NCCALCSIZE and wParam:
+                    return True, 0
+
+                # 支持动画
+                elif message_id == WM_SYSCOMMAND:
+                    return False, 0
+
+                # 处理 WM_GETMINMAXINFO 消息以支持 Snap 功能
+                elif message_id == WM_GETMINMAXINFO:
+                    # 获取屏幕工作区大小
+                    monitor = user32.MonitorFromWindow(hwnd_window, 2)  # MONITOR_DEFAULTTONEAREST
+
+                    # 使用自定义的 MONITORINFO 结构
+                    monitor_info = MONITORINFO()
+                    monitor_info.cbSize = ctypes.sizeof(MONITORINFO)
+                    monitor_info.dwFlags = 0
+                    user32.GetMonitorInfoW(monitor, ctypes.byref(monitor_info))
+
+                    # 获取 MINMAXINFO 结构
+                    minmax_info = MINMAXINFO.from_address(lParam)
+
+                    # 设置最大化位置和大小
+                    minmax_info.ptMaxPosition.x = monitor_info.rcWork.left - monitor_info.rcMonitor.left
+                    minmax_info.ptMaxPosition.y = monitor_info.rcWork.top - monitor_info.rcMonitor.top
+                    minmax_info.ptMaxSize.x = monitor_info.rcWork.right - monitor_info.rcWork.left
+                    minmax_info.ptMaxSize.y = monitor_info.rcWork.bottom - monitor_info.rcWork.top
+
+                    # 设置最小跟踪大小
+                    minmax_info.ptMinTrackSize.x = 200  # 最小宽度
+                    minmax_info.ptMinTrackSize.y = 150  # 最小高度
+
+                    return True, 0
+
+        return False, 0

{rinui-0.1.4.1 → rinui-0.1.5.2}/RinUI/windows/CtrlBtn.qml

@@ -26,7 +26,11 @@ Base {
         } else if (mode===1) {
             window.showMinimized();
         } else if (mode===2) {
-            window.close();
+            if (window.transientParent) {
+                window.visible = false;
+            } else {
+                window.close();
+            }
         }
     }
 

{rinui-0.1.4.1 → rinui-0.1.5.2}/RinUI/windows/FluentWindowBase.qml

@@ -18,7 +18,7 @@ ApplicationWindow {
     color: "transparent"
 
     // 自定义属性
-    property var icon: "../assets/img/default_app_icon.png"  // 图标
+    property var icon: undefined  // 图标
     property alias titleEnabled: titleBar.titleEnabled
     property int titleBarHeight: Theme.currentTheme.appearance.dialogTitleBarHeight
 

{rinui-0.1.4.1 → rinui-0.1.5.2/RinUI.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RinUI
-Version: 0.1.4.1
+Version: 0.1.5.2
 Summary: A Fluent Design-like UI library for Qt Quick (QML) based on PySide6
 Author-email: RinLit <lintu233_qwq@icloud.com>
 Classifier: Programming Language :: Python :: 3

{rinui-0.1.4.1 → rinui-0.1.5.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "RinUI"
-version = "0.1.4.1"
+version = "0.1.5.2"
 authors = [
     { name = "RinLit", email = "lintu233_qwq@icloud.com" }
 ]

rinui-0.1.4.1/RinUI/core/window.py

@@ -1,214 +0,0 @@
-import platform
-
-from PySide6.QtCore import QAbstractNativeEventFilter, QByteArray, QObject, Slot
-import ctypes
-from ctypes import wintypes
-
-import win32con
-from win32gui import ReleaseCapture, GetWindowPlacement, ShowWindow
-from win32con import SW_MAXIMIZE, SW_RESTORE
-from win32api import SendMessage
-
-from RinUI.core.config import is_windows
-
-# 定义 Windows 类型
-ULONG_PTR = ctypes.c_ulong if ctypes.sizeof(ctypes.c_void_p) == 4 else ctypes.c_ulonglong
-LONG = ctypes.c_long
-
-
-# 自定义结构体 MONITORINFO
-class MONITORINFO(ctypes.Structure):
-    _fields_ = [
-        ('cbSize', wintypes.DWORD),
-        ('rcMonitor', wintypes.RECT),
-        ('rcWork', wintypes.RECT),
-        ('dwFlags', wintypes.DWORD)
-    ]
-
-
-class MSG(ctypes.Structure):
-    _fields_ = [
-        ("hwnd", ctypes.c_void_p),
-        ("message", wintypes.UINT),
-        ("wParam", wintypes.WPARAM),
-        ("lParam", wintypes.LPARAM),
-        ("time", wintypes.DWORD),
-        ("pt", wintypes.POINT),
-    ]
-
-
-user32 = ctypes.windll.user32
-
-# 定义必要的 Windows 常量
-WM_NCCALCSIZE = 0x0083
-WM_NCHITTEST = 0x0084
-WM_SYSCOMMAND = 0x0112
-WM_GETMINMAXINFO = 0x0024
-
-WS_CAPTION = 0x00C00000
-WS_THICKFRAME = 0x00040000
-
-SC_MINIMIZE = 0xF020
-SC_MAXIMIZE = 0xF030
-SC_RESTORE = 0xF120
-
-
-class MINMAXINFO(ctypes.Structure):
-    _fields_ = [
-        ("ptReserved", wintypes.POINT),
-        ("ptMaxSize", wintypes.POINT),
-        ("ptMaxPosition", wintypes.POINT),
-        ("ptMinTrackSize", wintypes.POINT),
-        ("ptMaxTrackSize", wintypes.POINT),
-    ]
-
-
-class WinEventManager(QObject):
-    @Slot(QObject, result=int)
-    def getWindowId(self, window):
-        """获取窗口的句柄"""
-        print(f"GetWindowId: {window.winId()}")
-        return int(window.winId())
-
-    @Slot(int)
-    def dragWindowEvent(self, hwnd: int):
-        """ 在Windows 用原生方法拖动"""
-        if not is_windows() or type(hwnd) is not int or hwnd == 0:
-            print(
-                f"Use Qt method to drag window on: {platform.system()}"
-                if not is_windows() else f"Invalid window handle: {hwnd}"
-            )
-            return
-
-        ReleaseCapture()
-        SendMessage(
-            hwnd,
-            win32con.WM_SYSCOMMAND,
-            win32con.SC_MOVE | win32con.HTCAPTION, 0
-        )
-
-    @Slot(int)
-    def maximizeWindow(self, hwnd):
-        """在Windows上最大化或还原窗口"""
-        if not is_windows() or type(hwnd) is not int or hwnd == 0:
-            print(
-                f"Use Qt method to drag window on: {platform.system()}"
-                if not is_windows() else f"Invalid window handle: {hwnd}"
-            )
-            return
-
-        try:
-            placement = GetWindowPlacement(hwnd)
-            current_state = placement[1]
-
-            if current_state == SW_MAXIMIZE:
-                ShowWindow(hwnd, SW_RESTORE)
-            else:
-                ShowWindow(hwnd, SW_MAXIMIZE)
-
-        except Exception as e:
-            print(f"Error toggling window state: {e}")
-
-
-class WinEventFilter(QAbstractNativeEventFilter):
-    def __init__(self, window):
-        super().__init__()
-        self.window = window
-        self.hwnd = int(window.winId())
-        self.resize_border = 8  # resize 边框宽度
-
-        self.set_window_styles()
-
-    def set_window_styles(self):
-        """设置必要的窗口样式以启用原生窗口行为"""
-        style = user32.GetWindowLongPtrW(self.hwnd, -16)  # GWL_STYLE
-
-        style |= WS_CAPTION | WS_THICKFRAME
-        user32.SetWindowLongPtrW(self.hwnd, -16, style)  # GWL_STYLE
-
-        # 重绘
-        user32.SetWindowPos(self.hwnd, 0, 0, 0, 0, 0,
-                            0x0002 | 0x0001 | 0x0040)  # SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED
-
-    def nativeEventFilter(self, eventType: QByteArray, message):
-        if eventType != b"windows_generic_MSG":
-            return False, 0
-
-        try:
-            message_addr = int(message)
-        except:
-            buf = memoryview(message)
-            message_addr = ctypes.addressof(ctypes.c_char.from_buffer(buf))
-
-        # 直接使用内存地址访问 MSG 字段
-        hwnd = ctypes.c_void_p.from_address(message_addr).value
-        message_id = wintypes.UINT.from_address(message_addr + ctypes.sizeof(ctypes.c_void_p)).value
-        wParam = wintypes.WPARAM.from_address(message_addr + 2 * ctypes.sizeof(ctypes.c_void_p)).value
-        lParam = wintypes.LPARAM.from_address(message_addr + 3 * ctypes.sizeof(ctypes.c_void_p)).value
-
-        if message_id == WM_NCHITTEST:
-            x = ctypes.c_short(lParam & 0xFFFF).value
-            y = ctypes.c_short((lParam >> 16) & 0xFFFF).value
-
-            rect = wintypes.RECT()
-            user32.GetWindowRect(self.hwnd, ctypes.byref(rect))
-            left, top, right, bottom = rect.left, rect.top, rect.right, rect.bottom
-            border = self.resize_border
-
-            if left <= x < left + border:
-                if top <= y < top + border:
-                    return True, 13  # HTTOPLEFT
-                elif bottom - border <= y < bottom:
-                    return True, 16  # HTBOTTOMLEFT
-                else:
-                    return True, 10  # HTLEFT
-            elif right - border <= x < right:
-                if top <= y < top + border:
-                    return True, 14  # HTTOPRIGHT
-                elif bottom - border <= y < bottom:
-                    return True, 17  # HTBOTTOMRIGHT
-                else:
-                    return True, 11  # HTRIGHT
-            elif top <= y < top + border:
-                return True, 12  # HTTOP
-            elif bottom - border <= y < bottom:
-                return True, 15  # HTBOTTOM
-
-            # 其他区域不处理
-            return False, 0
-
-        # 移除标题栏
-        elif message_id == WM_NCCALCSIZE and wParam:
-            return True, 0
-
-        # 支持动画
-        elif message_id == WM_SYSCOMMAND:
-            return False, 0
-
-        # 处理 WM_GETMINMAXINFO 消息以支持 Snap 功能
-        elif message_id == WM_GETMINMAXINFO:
-            # 获取屏幕工作区大小
-            monitor = user32.MonitorFromWindow(self.hwnd, 2)  # MONITOR_DEFAULTTONEAREST
-
-            # 使用自定义的 MONITORINFO 结构
-            monitor_info = MONITORINFO()
-            monitor_info.cbSize = ctypes.sizeof(MONITORINFO)
-            monitor_info.dwFlags = 0
-            user32.GetMonitorInfoW(monitor, ctypes.byref(monitor_info))
-
-            # 获取 MINMAXINFO 结构
-            minmax_info = MINMAXINFO.from_address(lParam)
-
-            # 设置最大化位置和大小
-            minmax_info.ptMaxPosition.x = monitor_info.rcWork.left - monitor_info.rcMonitor.left
-            minmax_info.ptMaxPosition.y = monitor_info.rcWork.top - monitor_info.rcMonitor.top
-            minmax_info.ptMaxSize.x = monitor_info.rcWork.right - monitor_info.rcWork.left
-            minmax_info.ptMaxSize.y = monitor_info.rcWork.bottom - monitor_info.rcWork.top
-
-            # 设置最小跟踪大小
-            minmax_info.ptMinTrackSize.x = 200  # 最小宽度
-            minmax_info.ptMinTrackSize.y = 150  # 最小高度
-
-            return True, 0
-
-        return False, 0