RinUI 0.1.4.1__py3-none-any.whl → 0.1.5.2__py3-none-any.whl

RinUI/__init__.py

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

RinUI/components/Text/SpinBox.qml

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

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/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/core/window.py

@@ -1,10 +1,12 @@
 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
@@ -111,23 +113,38 @@ class WinEventManager(QObject):
 
 
 class WinEventFilter(QAbstractNativeEventFilter):
-    def __init__(self, window):
+    def __init__(self, windows: list):
         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
+        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(self.hwnd, -16, style)  # GWL_STYLE
+        user32.SetWindowLongPtrW(hwnd, -16, style)  # GWL_STYLE
 
         # 重绘
-        user32.SetWindowPos(self.hwnd, 0, 0, 0, 0, 0,
+        user32.SetWindowPos(hwnd, 0, 0, 0, 0, 0,
                             0x0002 | 0x0001 | 0x0040)  # SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED
 
     def nativeEventFilter(self, eventType: QByteArray, message):
@@ -146,69 +163,73 @@ class WinEventFilter(QAbstractNativeEventFilter):
         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
+        # 遍历每个窗口，检查哪个窗口收到了消息
+        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/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/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.dist-info → rinui-0.1.5.2.dist-info}/METADATA

@@ -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.dist-info → rinui-0.1.5.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-RinUI/__init__.py,sha256=d9IqpbSfnP6x6uXkS5V5liug1uHaNhct-nbJQXNhEAA,67
+RinUI/__init__.py,sha256=68D7COFIrSHlQKtabW1X-SFZtRz27mLAEQdjxIJWMB0,67
 RinUI/qmldir,sha256=M0TVfvNm_nrx1s6rxXvUIP-8m3Oc9UhqHDxQfEIdQTA,3959
 RinUI/assets/fonts/FluentSystemIcons-Index.js,sha256=M2fUmCiOI7A1rxLWMFaekrB4KmasTSwbociYOzHJegE,253422
 RinUI/assets/fonts/FluentSystemIcons-Resizable.ttf,sha256=-IfF3NT1eODD0vOLVLC0Z2U5bsR6woSQAziX3qD1TqU,1447252
@@ -65,17 +65,17 @@ RinUI/components/StatusAndInfo/ProgressBar.qml,sha256=4q2LKNHNFYChl81Hwhwm_9GcYc
 RinUI/components/StatusAndInfo/ProgressRing.qml,sha256=aeWl1v3hom-iI2MNkO_FfFkJaJy23Lo49oiL6bwclaM,5088
 RinUI/components/StatusAndInfo/Toast.qml,sha256=XWZPgFBJnqoWoS6H9W3ycC9JTU1CTzehqVIm2KXhD6Y,6815
 RinUI/components/StatusAndInfo/ToolTip.qml,sha256=f6S9rG_0GsHQl8BB1m4Niik35s7LngelAasLfFkdR7s,2664
-RinUI/components/Text/SpinBox.qml,sha256=rY17yJ3a0ckkl6pX00qVIQQYLmoO-GLtcSZh-WKtPZs,4616
+RinUI/components/Text/SpinBox.qml,sha256=lLJ8J5KPAi42ZK1bM5JUnME8njDsdzTSz_W-Tpp2L8A,4616
 RinUI/components/Text/Text.qml,sha256=SWJBJtAWkq9XldrX6_BWfCXGRcLQLBNofkRO5NG8q2Q,1714
 RinUI/components/Text/TextArea.qml,sha256=guhwcFBSEyZkTRT2V0ER3S03xW9WOkH_4U2Oor2I9PY,3706
 RinUI/components/Text/TextField.qml,sha256=BXuJ16AUQaSh-Og7jaYSNEu9r1PcyG7FQ95DaGciJZs,3556
 RinUI/components/Text/TextInput.qml,sha256=gyTJmrYi5yuc-j5dDRSbu5PCxiuQo2xNBm6jWL9ezYk,1611
 RinUI/core/__init__.py,sha256=xNbsFDXuObMebyn0Xsxieenh0fsAEjULqBd9qd8suTY,283
 RinUI/core/config.py,sha256=h5tbQurVtpnfB10OMTWEZstzsF93zDOPDmbP9NRgvJk,3683
-RinUI/core/launcher.py,sha256=ZWBGQP0DT2oWZXvqRK9cW7eRmImZe8L1B1-0ONgaGnc,5812
-RinUI/core/theme.py,sha256=r47QltFKy_s-B1neVAjYIx_jOxxtsdJEMP-u-YJ8mpA,9832
+RinUI/core/launcher.py,sha256=pUKcpErcDsDqfTIcZHqG8ErQOHGqkqPnwkUKiEtujBQ,6024
+RinUI/core/theme.py,sha256=GfLFtorGVvRmBCR97hpvwKGVwfrN4AD9FFEIDupVszM,9788
 RinUI/core/translator.py,sha256=5GK7Iy7-2iMicF8hQr79CwU9UWvCwE-8vGd8QkhJ1h8,1037
-RinUI/core/window.py,sha256=KIu3qpN_RKcMc-8o6qxYAWecDVNBtjxCjqUN04RaI6I,7161
+RinUI/core/window.py,sha256=vSbcos5B2gioKev6jiVBMtNzn01_ZvieCly6Pw6U5kI,8408
 RinUI/hooks/__init__.py,sha256=7sQJlly1ZbiZTzZUkCV2hI_gY-DAxWP_0kLyhZQ2Tm8,74
 RinUI/hooks/hook-RinUI.py,sha256=VvQui-b3YNuxvhqjRJqLPKdtnWQ6Ev8G9DEgzGNUUUI,116
 RinUI/languages/en_US.qm,sha256=mVm1ELFdGJN4SK0TAH4wRZ0umTxn5WS62_wY-TVpXIU,16
@@ -96,20 +96,20 @@ RinUI/utils/Position.qml,sha256=QuD_cYdU7ku3L1zxFX8e0ZKDvOOW7xbilP2_ebr7WB8,256
 RinUI/utils/Severity.qml,sha256=fN3YQ_88kNGB-Z57pzcDrz15r-JPMLPJfNUVqKkYbas,155
 RinUI/utils/Typography.qml,sha256=EJIlEymSWH4lWyRIrdWD9UZaExgGld81YQF1diaKKq8,232
 RinUI/utils/qmldir,sha256=W2UTrZ5VPdRO64FZ3Pw-_8B2UPj7A_eHsGrLPvWtiZY,189
-RinUI/windows/CtrlBtn.qml,sha256=8wQH3PWYmZ_e6A0_CIdmYa7uIrU6O6MZCG_RR4S4fkg,3152
+RinUI/windows/CtrlBtn.qml,sha256=7o67Ci1eKI22tl00s2klnwdmU9mhyzp8UQOTzF_5XtI,3273
 RinUI/windows/FluentPage.qml,sha256=J7mXTOyMahdWA8U13rSjesJVsvxklZFQyqwVMiJarT8,2748
 RinUI/windows/FluentWindow.qml,sha256=CUx9H5crOKtPSCnA6_AUst4PcLEbhSjDRrSuWH8novA,969
-RinUI/windows/FluentWindowBase.qml,sha256=rUUHO1lIjIIvrHjKHwSIEn8WOG2kY45mJQQT_KrGZDM,4335
+RinUI/windows/FluentWindowBase.qml,sha256=QV0WwRTL997c2Q8TNvsl8fNXLfkZabQvh0O0kT9NxhI,4308
 RinUI/windows/TitleBar.qml,sha256=QjnSb27Db2e8o2QniuJUMT0QI6awMbavVNex70Wsy2s,3591
 RinUI/windows/WindowManager.qml,sha256=f-Il6FCPf3_o6edj5BbscK2XxQd3mmUVnZPZuOO88kc,1037
 RinUI/windows/qmldir,sha256=oxyWR7Q8dWCrwwCwGNyf3l60qe6s4-beiZWWMAEkKcM,252
 RinUI/windows/window/ApplicationWindow.qml,sha256=qRaM8IY0TJxfq1j1DogTMyrPjyoXkuWVzxtZQLzRtOQ,167
 RinUI/windows/window/Window.qml,sha256=90YjjRoaul9qK4FxNy73zTaPuUmLvk_RjcPlBEa7DNI,3189
-rinui-0.1.4.1.data/data/LICENSE,sha256=vgoqqpny5vKYu34VDBUWYQKzT7Nn-Xy9y8USmcOCyZQ,1063
-rinui-0.1.4.1.data/data/README.md,sha256=8ZcR55RYV2slRAQbhoYhqDTPOLXmewkFSvuA_cE6zD0,3044
-rinui-0.1.4.1.dist-info/licenses/LICENSE,sha256=vgoqqpny5vKYu34VDBUWYQKzT7Nn-Xy9y8USmcOCyZQ,1063
-rinui-0.1.4.1.dist-info/METADATA,sha256=YmwxS5tHeWcDsCsZxZlH2vYgo3vyXCZSw3-9yvbpBx0,3577
-rinui-0.1.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rinui-0.1.4.1.dist-info/entry_points.txt,sha256=taxuZYCggoQa2LPubwcurQYRjBRC4cNYOjWaqOYZVxw,54
-rinui-0.1.4.1.dist-info/top_level.txt,sha256=vKKjXBXEw5OFRIzTxZWUC5ZOj0CK5e3atbymBB4eJ6w,6
-rinui-0.1.4.1.dist-info/RECORD,,
+rinui-0.1.5.2.data/data/LICENSE,sha256=vgoqqpny5vKYu34VDBUWYQKzT7Nn-Xy9y8USmcOCyZQ,1063
+rinui-0.1.5.2.data/data/README.md,sha256=8ZcR55RYV2slRAQbhoYhqDTPOLXmewkFSvuA_cE6zD0,3044
+rinui-0.1.5.2.dist-info/licenses/LICENSE,sha256=vgoqqpny5vKYu34VDBUWYQKzT7Nn-Xy9y8USmcOCyZQ,1063
+rinui-0.1.5.2.dist-info/METADATA,sha256=19MjmBD4L9YAwV7JCrooUGMA_4OCccUYkULYwJk_FjA,3577
+rinui-0.1.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rinui-0.1.5.2.dist-info/entry_points.txt,sha256=taxuZYCggoQa2LPubwcurQYRjBRC4cNYOjWaqOYZVxw,54
+rinui-0.1.5.2.dist-info/top_level.txt,sha256=vKKjXBXEw5OFRIzTxZWUC5ZOj0CK5e3atbymBB4eJ6w,6
+rinui-0.1.5.2.dist-info/RECORD,,