PyWebWinUI3 1.2.0__tar.gz → 1.2.2__tar.gz

{pywebwinui3-1.2.0/PyWebWinUI3.egg-info → pywebwinui3-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyWebWinUI3
-Version: 1.2.0
+Version: 1.2.2
 Summary: Create modern WinUI3-style desktop UIs in Python using pywebview and a Svelte frontend.
 Home-page: https://github.com/Haruna5718/PyWebWinUI3
 Author: Haruna5718

{pywebwinui3-1.2.0 → pywebwinui3-1.2.2/PyWebWinUI3.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyWebWinUI3
-Version: 1.2.0
+Version: 1.2.2
 Summary: Create modern WinUI3-style desktop UIs in Python using pywebview and a Svelte frontend.
 Home-page: https://github.com/Haruna5718/PyWebWinUI3
 Author: Haruna5718

{pywebwinui3-1.2.0 → pywebwinui3-1.2.2}/PyWebWinUI3.egg-info/SOURCES.txt

@@ -112,17 +112,17 @@ pywebwinui3/web/Pretendard/PretendardVariable.subset.91.woff2
 pywebwinui3/web/Pretendard/Variable-dynamic-subset.min.css
 pywebwinui3/web/_app/env.js
 pywebwinui3/web/_app/version.json
-pywebwinui3/web/_app/immutable/assets/2.CgNWjm1R.css
+pywebwinui3/web/_app/immutable/assets/2.YxEoeVwz.css
 pywebwinui3/web/_app/immutable/chunks/6pQH9Hkv.js
 pywebwinui3/web/_app/immutable/chunks/B-XLOWlt.js
-pywebwinui3/web/_app/immutable/chunks/BF2c23Wg.js
 pywebwinui3/web/_app/immutable/chunks/CGGCsFu4.js
 pywebwinui3/web/_app/immutable/chunks/CW0wlPPy.js
 pywebwinui3/web/_app/immutable/chunks/CZPLFskb.js
 pywebwinui3/web/_app/immutable/chunks/CZuXpvpo.js
+pywebwinui3/web/_app/immutable/chunks/D94BNvJJ.js
 pywebwinui3/web/_app/immutable/chunks/DF1x2LYX.js
-pywebwinui3/web/_app/immutable/entry/app.C_Ap8SyA.js
-pywebwinui3/web/_app/immutable/entry/start.BBET_QR9.js
+pywebwinui3/web/_app/immutable/entry/app.B-Q6XOuJ.js
+pywebwinui3/web/_app/immutable/entry/start.C1-i6FUr.js
 pywebwinui3/web/_app/immutable/nodes/0.C49PHrK2.js
-pywebwinui3/web/_app/immutable/nodes/1.gP9JsMWl.js
-pywebwinui3/web/_app/immutable/nodes/2.SvYNzG6D.js
+pywebwinui3/web/_app/immutable/nodes/1.a96iIGzo.js
+pywebwinui3/web/_app/immutable/nodes/2.Ofs4dh3G.js

{pywebwinui3-1.2.0 → pywebwinui3-1.2.2}/pywebwinui3/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["core", "event", "util", "type"]
 
-__version__ = '1.2.0'
+__version__ = '1.2.2'

{pywebwinui3-1.2.0 → pywebwinui3-1.2.2}/pywebwinui3/core.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import ctypes
 import importlib
 import json
 import logging
@@ -12,6 +13,7 @@ from http import HTTPStatus
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
 from pathlib import Path
 from urllib.parse import unquote, urlparse, urlunparse
+from ctypes import wintypes
 
 import webview
 from hPyT import title_bar
@@ -29,6 +31,93 @@ DEFAULT_WINDOW_MIN_WIDTH = 100
 DEFAULT_WINDOW_MIN_HEIGHT = 100
 
 
+class _Point(ctypes.Structure):
+	_fields_ = [
+		("x", ctypes.c_long),
+		("y", ctypes.c_long),
+	]
+
+_user32 = ctypes.WinDLL("user32", use_last_error=True)
+_kernel32 = ctypes.WinDLL("kernel32", use_last_error=True)
+_uxtheme = ctypes.WinDLL("uxtheme", use_last_error=True)
+
+_kernel32.GetProcAddress.argtypes = [wintypes.HMODULE, wintypes.LPCSTR]
+_kernel32.GetProcAddress.restype = ctypes.c_void_p
+_user32.ReleaseCapture.argtypes = []
+_user32.ReleaseCapture.restype = ctypes.c_bool
+_user32.GetCursorPos.argtypes = [ctypes.POINTER(_Point)]
+_user32.GetCursorPos.restype = ctypes.c_bool
+_user32.GetSystemMenu.argtypes = [ctypes.c_void_p, ctypes.c_bool]
+_user32.GetSystemMenu.restype = ctypes.c_void_p
+_user32.IsZoomed.argtypes = [ctypes.c_void_p]
+_user32.IsZoomed.restype = ctypes.c_bool
+_user32.PostMessageW.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_size_t, ctypes.c_ssize_t]
+_user32.PostMessageW.restype = ctypes.c_bool
+_user32.SendMessageW.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_size_t, ctypes.c_ssize_t]
+_user32.SendMessageW.restype = ctypes.c_ssize_t
+_user32.SetForegroundWindow.argtypes = [ctypes.c_void_p]
+_user32.SetForegroundWindow.restype = ctypes.c_bool
+_user32.ShowWindow.argtypes = [ctypes.c_void_p, ctypes.c_int]
+_user32.ShowWindow.restype = ctypes.c_bool
+_user32.TrackPopupMenu.argtypes = [
+	ctypes.c_void_p,
+	ctypes.c_uint,
+	ctypes.c_int,
+	ctypes.c_int,
+	ctypes.c_int,
+	ctypes.c_void_p,
+	ctypes.c_void_p,
+]
+_user32.TrackPopupMenu.restype = ctypes.c_uint
+
+
+def _load_ordinal_function(module, ordinal: int, restype, argtypes):
+	address = _kernel32.GetProcAddress(
+		wintypes.HMODULE(module._handle),
+		ctypes.cast(ctypes.c_void_p(ordinal), wintypes.LPCSTR),
+	)
+	if not address:
+		return None
+	function = ctypes.WINFUNCTYPE(restype, *argtypes)(address)
+	function.argtypes = argtypes
+	function.restype = restype
+	return function
+
+
+_allow_dark_mode_for_window = (
+	_load_ordinal_function(_uxtheme, 145, ctypes.c_bool, [ctypes.c_void_p, ctypes.c_bool])
+	or _load_ordinal_function(_uxtheme, 133, ctypes.c_bool, [ctypes.c_void_p, ctypes.c_bool])
+)
+_set_preferred_app_mode = _load_ordinal_function(_uxtheme, 135, ctypes.c_int, [ctypes.c_int])
+_flush_menu_themes = _load_ordinal_function(_uxtheme, 136, None, [])
+
+
+def _apply_menu_theme_support(theme: str | None, hwnd: int | None = None):
+	if _set_preferred_app_mode is None:
+		return False
+	try:
+		normalized = str(theme or "system").casefold()
+		if normalized == "dark":
+			mode = 2  # ForceDark
+			allow_dark = True
+		elif normalized == "light":
+			mode = 3  # ForceLight
+			allow_dark = False
+		else:
+			mode = 1  # AllowDark
+			allow_dark = True
+
+		_set_preferred_app_mode(mode)
+		if hwnd is not None and _allow_dark_mode_for_window is not None:
+			_allow_dark_mode_for_window(hwnd, allow_dark)
+		if _flush_menu_themes is not None:
+			_flush_menu_themes()
+		return True
+	except Exception:
+		core_logger.debug("Failed to apply menu theme support", exc_info=True)
+		return False
+
+
 def _default_ui_origin_host(title: str) -> str:
 	slug = re.sub(r"[^a-z0-9]+", "-", str(title).casefold()).strip("-")
 	if not slug:
@@ -93,6 +182,9 @@ class _JsApi:
 		self.syncValue = main.syncValue
 		self.syncValues = main._sync_values
 		self.pin = main.pin
+		self.startWindowDrag = main.startWindowDrag
+		self.toggleWindowMaximize = main.toggleWindowMaximize
+		self.showWindowSystemMenu = main.showWindowSystemMenu
 		self.minimize = main.minimize
 		self.destroy = main.destroy
 		self.resolveResource = main.resolveResource
@@ -141,11 +233,13 @@ class MainWindow:
 				"system_settings": None,
 				"system_nofication": [],
 				"system_pin": False,
+				"system_maximized": False,
 			}
 		)
 		self.values.sync = self.queue_sync_value
 		self._start_ui_server()
 		self._configure_webview2_origin_identity()
+		_apply_menu_theme_support(self.values.get("system_theme"))
 
 		self._window = webview.create_window(
 			self._current_title(),
@@ -166,6 +260,8 @@ class MainWindow:
 		self.api._init(self)
 		self._window.events.before_show += self._before_show
 		self._window.events.closed += self._on_closed
+		self._window.events.maximized += lambda *_: self._set_window_maximized_state(True)
+		self._window.events.restored += lambda *_: self._set_window_maximized_state(False)
 
 		core_logger.debug("Window created")
 
@@ -208,6 +304,8 @@ class MainWindow:
 		return state
 
 	def syncValue(self, key, value):
+		if key == "system_theme":
+			_apply_menu_theme_support(value, self._window_handle())
 		return self.values.set(key, value, False)
 
 	def addSettings(self, pageFile: str | Path | None = None, pageData: dict | None = None):
@@ -246,6 +344,15 @@ class MainWindow:
 	def _current_title(self):
 		return self.values.get("system_title", self._title)
 
+	def _window_handle(self) -> int | None:
+		try:
+			native = getattr(self._window, "native", None)
+			if native is None:
+				return None
+			return int(native.Handle.ToInt64())
+		except Exception:
+			return None
+
 	def _entry_path(self) -> Path:
 		entry = (Path(self.packagePath) / "index.html").resolve()
 		if not entry.is_file():
@@ -289,6 +396,14 @@ class MainWindow:
 			self._ui_server = None
 			self._ui_server_thread = None
 
+	def _resolve_path_under(self, base_path: Path, relative_path: str) -> Path | None:
+		candidate = (base_path / relative_path).resolve()
+		try:
+			candidate.relative_to(base_path)
+		except ValueError:
+			return None
+		return candidate
+
 	def _resolve_server_path(self, raw_path: str) -> Path | None:
 		path = unquote(raw_path or "/")
 		if path in {"", "/"}:
@@ -299,23 +414,10 @@ class MainWindow:
 				continue
 
 			prefix = f"/__{name}__/"
-			if not path.startswith(prefix):
-				continue
-
-			relative = path[len(prefix) :]
-			candidate = (base_path / relative).resolve()
-			try:
-				candidate.relative_to(base_path)
-			except ValueError:
-				return None
-			return candidate
+			if path.startswith(prefix):
+				return self._resolve_path_under(base_path, path[len(prefix) :])
 
-		candidate = (self.packagePath / path.lstrip("/")).resolve()
-		try:
-			candidate.relative_to(self.packagePath)
-		except ValueError:
-			return None
-		return candidate
+		return self._resolve_path_under(self.packagePath, path.lstrip("/"))
 
 	def _resource_url(self, path: Path) -> str:
 		path = path.resolve()
@@ -334,11 +436,14 @@ class MainWindow:
 	def _before_show(self):
 		try:
 			hwnd = self._window.native.Handle.ToInt64()
+			_apply_menu_theme_support(self.values.get("system_theme"), hwnd)
 			title_bar.hide(hwnd)
+			self._set_window_maximized_state(bool(_user32.IsZoomed(hwnd)), sync=False)
 		except Exception:
 			core_logger.debug("Failed to hide title bar", exc_info=True)
 
 	def _on_closed(self):
+		self.accent.stop()
 		self._stop_ui_server()
 		self.events.closed.set()
 
@@ -368,6 +473,16 @@ class MainWindow:
 	def queue_sync_value(self, key: str, value):
 		self._dispatch_or_defer_sync(key, value)
 
+	def _set_window_maximized_state(self, value: bool, *, sync: bool = True):
+		value = bool(value)
+		if self.values.get("system_maximized") == value:
+			return
+		self.values.set("system_maximized", value, False)
+		if sync:
+			timer = threading.Timer(0.01, lambda: self.queue_sync_value("system_maximized", value))
+			timer.daemon = True
+			timer.start()
+
 	def _init_payload(self):
 		return dict(self.values)
 
@@ -415,6 +530,87 @@ class MainWindow:
 		except Exception:
 			core_logger.debug("Failed to set window on top", exc_info=True)
 
+	def startWindowDrag(self):
+		try:
+			native = getattr(self._window, "native", None)
+			if native is None:
+				return
+
+			action_type = getattr(importlib.import_module("System"), "Action")
+
+			def _apply():
+				hwnd = int(native.Handle.ToInt64())
+				_user32.ReleaseCapture()
+				_user32.SendMessageW(hwnd, 0x00A1, 2, 0)  # WM_NCLBUTTONDOWN, HTCAPTION
+
+			if native.InvokeRequired:
+				native.BeginInvoke(action_type(_apply))
+			else:
+				_apply()
+		except Exception:
+			core_logger.debug("Failed to start system window drag", exc_info=True)
+
+	def toggleWindowMaximize(self):
+		try:
+			native = getattr(self._window, "native", None)
+			if native is None:
+				return
+
+			action_type = getattr(importlib.import_module("System"), "Action")
+
+			def _apply():
+				hwnd = int(native.Handle.ToInt64())
+				is_zoomed = bool(_user32.IsZoomed(hwnd))
+				command = 9 if is_zoomed else 3  # SW_RESTORE / SW_MAXIMIZE
+				_user32.ShowWindow(hwnd, command)
+
+			if native.InvokeRequired:
+				native.BeginInvoke(action_type(_apply))
+			else:
+				_apply()
+		except Exception:
+			core_logger.debug("Failed to toggle window maximize", exc_info=True)
+
+	def showWindowSystemMenu(self):
+		try:
+			native = getattr(self._window, "native", None)
+			if native is None:
+				return
+
+			action_type = getattr(importlib.import_module("System"), "Action")
+
+			def _apply():
+				hwnd = int(native.Handle.ToInt64())
+				menu = _user32.GetSystemMenu(hwnd, False)
+				if not menu:
+					return
+				_apply_menu_theme_support(self.values.get("system_theme"), hwnd)
+
+				cursor = _Point()
+				if not _user32.GetCursorPos(ctypes.byref(cursor)):
+					return
+
+				_user32.SetForegroundWindow(hwnd)
+				command = _user32.TrackPopupMenu(
+					menu,
+					0x0100 | 0x0002,  # TPM_RETURNCMD | TPM_RIGHTBUTTON
+					cursor.x,
+					cursor.y,
+					0,
+					hwnd,
+					None,
+				)
+				if command:
+					_user32.PostMessageW(hwnd, 0x0112, command, 0)  # WM_SYSCOMMAND
+				_user32.PostMessageW(hwnd, 0x0000, 0, 0)  # WM_NULL
+
+			if native.InvokeRequired:
+				native.BeginInvoke(action_type(_apply))
+			else:
+				_apply()
+		except Exception:
+			core_logger.debug("Failed to show window system menu", exc_info=True)
+
 	def get_window_size(self) -> tuple[int, int]:
 		width = int(getattr(self._window, "initial_width", DEFAULT_WINDOW_WIDTH))
 		height = int(getattr(self._window, "initial_height", DEFAULT_WINDOW_HEIGHT))

{pywebwinui3-1.2.0 → pywebwinui3-1.2.2}/pywebwinui3/type.py

@@ -246,55 +246,100 @@ class Color:
 # 		gap = "inherit"
 # 		round = "4px"
 # 		border = "1px"
+# 		margin = "0"
 # 		padding = "16px"
+# 		width = "auto"
+# 		height = "auto"
 # 		align = "inherit"
 # 		background = Color.Background.Card.Default
+#
 # 	class Button:
 # 		disabled = False
 # 		value = None
-# 		width = "auto"
-# 		height = "auto"
-# 		type = None
+# 		type = None # None | "toggle" | "link"
 # 		url = None
+# 		target = "blank"
+# 		margin = "0"
+# 		width = "fit-content"
+# 		height = "fit-content"
+# 		padding = "6px 10px"
+# 		round = "4px"
+# 		color = "inherit"
+# 		background = Color.Fill.Control.Default
+# 		hoverBackground = Color.Fill.Control.Secondary
+# 		activeBackground = Color.Fill.Control.Tertiary
+# 		borderColor = Color.Stroke.Control.Default
+# 		shadow = "0 1px 0 0 var(--SmokeFillColorDefaultBrush), 0 0 0 1px var(--button-border-color) inset"
+# 		selectColor = Color.Fill.Text.OnAccent.Primary
+# 		selectBackground = Color.Fill.Accent.Default
+# 		selectHoverBackground = Color.Fill.Accent.Secondary
+# 		selectActiveBackground = Color.Fill.Accent.Tertiary
+# 		selectActiveColor = Color.Fill.Text.OnAccent.Secondary
+#
 # 	class Check:
 # 		disabled = False
 # 		value = None
+# 		margin = "0"
 # 		align = "left"
-# 		type = "two"
+# 		type = "two" # "two" | "three"
+#
 # 	class Expender:
 # 		disabled = False
-# 		gap = "inherit"
+# 		margin = "0"
+# 		width = "auto"
+# 		height = "auto"
 # 		round = "4px"
-# 		padding = "16px"
-# 		align = "inherit"
+#
 # 	class Horizontal:
 # 		gap = "inherit"
+# 		padding = "0"
+# 		margin = "0"
+# 		width = "auto"
+# 		height = "auto"
 # 		align = "inherit"
+#
 # 	class If:
 # 		disabled = False
-# 		value = None
+# 		data = None
+# 		raw = None
+#
 # 	class Image:
 # 		disabled = False
 # 		source = None
+# 		margin = "0"
 # 		width = "auto"
 # 		height = "auto"
+# 		round = "0"
+# 		background = "transparent"
+# 		fit = "contain"
+#
 # 	class Input:
 # 		disabled = False
+# 		value = None
+# 		type = "text"
+# 		margin = "0"
 # 		width = "auto"
 # 		height = "auto"
-# 		type = "text"
 # 		min = None
 # 		max = None
-# 		value = None
+# 		step = None
+# 		button = True
+#
 # 	class Line:
 # 		margin = "0"
-# 		size = "1"
+# 		size = "1px"
 # 		color = Color.Fill.Control.Strong.Default
+#
 # 	class Match:
 # 		disabled = False
-# 		value = None
+# 		data = None
+#
 # 	class Option:
 # 		value = None
+# 		# internal attrs injected by Select:
+# 		# optionValue = None
+# 		# selectType = "Single"
+#
 # 	class Page:
 # 		title = None
 # 		name = None
@@ -302,40 +347,62 @@ class Color:
 # 		icon = ""
 # 		state = None
 # 		badge = None
+#
 # 	class Progressbar:
 # 		disabled = False
-# 		type = None
+# 		type = None # "progress" | "running" | "success" | "paused" | "error"
+# 		margin = "0"
 # 		width = "160px"
-# 		value = None
+# 		height = "4px"
+# 		data = 0
+# 		round = "2px"
+# 		trackRound = "1px"
+# 		color = Color.Fill.Accent.Default
+# 		background = Color.Fill.Control.Strong.Default
+# 		shadow = "0 1px 0 0 var(--SmokeFillColorDefaultBrush)"
+#
 # 	class Radio:
 # 		disabled = False
 # 		group = None
 # 		value = None
+# 		margin = "0"
+# 		align = "left"
+#
 # 	class Repeat:
 # 		disabled = False
-# 		data = None
-# 		value = None
+# 		data = 0
+#
 # 	class Select:
 # 		disabled = False
+# 		value = None
+# 		type = "Single" # "Single" | "Multiple"
+# 		displayValue = None
+# 		margin = "0"
 # 		width = "auto"
 # 		height = "auto"
-# 		value = None
+#
 # 	class Slider:
 # 		disabled = False
+# 		value = None
+# 		type = "horizontal" # "horizontal" | "vertical"
+# 		margin = "0"
 # 		width = "160px"
-# 		type = "horizontal"
 # 		min = 0
 # 		max = 100
 # 		step = 1
-# 		value = None
+#
 # 	class Space:
+# 		size = None
 # 		factor = 1
+#
 # 	class Switch:
 # 		disabled = False
+# 		value = None
+# 		margin = "0"
 # 		align = "left"
 # 		on = "ON"
 # 		off = "OFF"
-# 		value = None
+#
 # 	class Text:
 # 		disabled = False
 # 		type = "default"
@@ -343,20 +410,24 @@ class Color:
 # 		color = None
 # 		size = None
 # 		url = None
+# 		target = "blank"
+#
 # 	class Vertical:
 # 		gap = "inherit"
+# 		padding = "0"
+# 		margin = "0"
 # 		width = "auto"
+# 		height = "auto"
 # 		align = "inherit"
+#
 # 	class Webview:
 # 		disabled = False
 # 		source = None
+# 		data = None
+# 		aspect = None
+# 		allow = None
+# 		margin = "0"
 # 		width = "auto"
-# 		height = "auto"
-
-# 	Other = [
-# 		"Case",
-# 		"True",
-# 		"False",
-# 		"Header",
-# 		"Content",
-# 	]
+# 		height = "400px"
+# 		round = "0"
+# 		background = "transparent"