RinUI 0.1.4__tar.gz → 0.1.5.1__tar.gz

{rinui-0.1.4/RinUI.egg-info → rinui-0.1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RinUI
-Version: 0.1.4
+Version: 0.1.5.1
 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 → rinui-0.1.5.1}/RinUI/__init__.py

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

{rinui-0.1.4 → rinui-0.1.5.1}/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 → rinui-0.1.5.1}/RinUI/core/config.py

@@ -1,9 +1,9 @@
-import os
 import json
 import platform
 import sys
-from PySide6.QtCore import QLocale
 from enum import Enum
+from pathlib import Path
+import os
 
 
 def is_win11():
@@ -27,15 +27,16 @@ def is_windows():
 def resource_path(relative_path):
     """兼容 PyInstaller 打包和开发环境的路径"""
     if hasattr(sys, '_MEIPASS'):
-        return os.path.join(sys._MEIPASS, relative_path)
-    return os.path.abspath(relative_path)
+        return Path(sys._MEIPASS) / relative_path
+    return Path(relative_path).resolve()
+
 
+rinui_core_path = Path(__file__).resolve().parent  # RinUI/core 目录
 
-rinui_core_path = os.path.abspath(os.path.dirname(__file__))  # RinUI/core 目录
+BASE_DIR = Path.cwd().resolve()
+PATH = BASE_DIR / "RinUI" / "config"
+RINUI_PATH = resource_path(rinui_core_path.parent.parent)  # 使用 resource_path 处理路径，等同 ../../
 
-BASE_DIR = os.path.abspath(os.getcwd())
-PATH = os.path.join(BASE_DIR, "RinUI/config")
-RINUI_PATH = resource_path(os.path.join(rinui_core_path, "../../"))  # 使用 resource_path 处理路径
 DEFAULT_CONFIG = {
     "theme": {
         "current_theme": "Auto",

{rinui-0.1.4 → rinui-0.1.5.1}/RinUI/core/launcher.py

@@ -1,4 +1,3 @@
-import os
 import sys
 from typing import Union
 
@@ -54,9 +53,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}")
@@ -99,13 +98,14 @@ class RinUIWindow:
         self.engine.rootContext().setContextProperty("WinEventManager", self.win_event_manager)
         self._apply_windows_effects()
 
-    def setIcon(self, path: str) -> None:
+    def setIcon(self, path: Union[str, Path] = None) -> None:
         """
         Sets the icon for the application.
-        :param path: str, icon file path (eg = "path/to/icon.png")
+        :param path: str or Path, icon file path (eg = "path/to/icon.png")
         :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 → rinui-0.1.5.1}/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,13 +113,25 @@ class WinEventManager(QObject):
 
 
 class WinEventFilter(QAbstractNativeEventFilter):
-    def __init__(self, window):
+    def __init__(self, window: QQuickWindow):
         super().__init__()
         self.window = window
-        self.hwnd = int(window.winId())
-        self.resize_border = 8  # resize 边框宽度
+        self.hwnd: Optional[int] = None
+        self.resize_border = 8
 
+        if not self.window.isVisible():
+            self.window.visibleChanged.connect(self._on_visible_changed)
+        else:
+            self._init_window_handle()
+
+    def _on_visible_changed(self, visible: bool):
+        if visible and self.hwnd is None:
+            self._init_window_handle()
+
+    def _init_window_handle(self):
+        self.hwnd = int(self.window.winId())
         self.set_window_styles()
+        print(f"Window handle set: {self.hwnd}")
 
     def set_window_styles(self):
         """设置必要的窗口样式以启用原生窗口行为"""

{rinui-0.1.4 → rinui-0.1.5.1}/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 → rinui-0.1.5.1/RinUI.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RinUI
-Version: 0.1.4
+Version: 0.1.5.1
 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 → rinui-0.1.5.1}/pyproject.toml

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