quickwin 2.3.1 → 3.0.1

package/lib/react-qw/components/ListBox.d.ts

@@ -0,0 +1,13 @@
+import * as gui from 'gui';
+import type { WStyle } from '../jsx.d.ts';
+export interface ListBoxProps {
+    items: string[];
+    selectedIndex?: number;
+    defaultSelectedIndex?: number;
+    onChange?: (index: number) => void;
+    style?: WStyle;
+    disabled?: boolean;
+    sort?: boolean;
+    scrollToBottom?: boolean;
+}
+export declare const ListBox: import("react").ForwardRefExoticComponent<ListBoxProps & import("react").RefAttributes<gui.HWND>>;

package/lib/react-qw/components/ListView.d.ts

@@ -0,0 +1,37 @@
+import * as gui from 'gui';
+import type { WStyle } from '../jsx.d.ts';
+import { StandardCursor } from '../../../constants';
+export declare function makeColorBlock(size: number, bgra: number): ArrayBuffer;
+export type Align = 'left' | 'center' | 'right';
+export interface CellStyle {
+    color?: number;
+    background?: number;
+    bold?: boolean;
+    underline?: boolean;
+    italic?: boolean;
+    cursor?: StandardCursor;
+}
+export interface Column<D> {
+    name: string;
+    dataIndex?: keyof D;
+    width?: number;
+    align?: Align;
+    render?: (record: D, index: number) => string;
+    cellStyle?: CellStyle | ((record: D, index: number) => CellStyle);
+    onCellClick?: (record: D, index: number) => void;
+}
+export interface ListViewProps<D extends object> {
+    columns: Column<D>[];
+    data: D[];
+    style?: WStyle;
+    /** 图标像素数据数组，每个元素为 iconSize*iconSize*4 的 BGRA 像素 ArrayBuffer（色块/程序生成） */
+    icons?: ArrayBuffer[];
+    /** 图标尺寸，默认 32 */
+    iconSize?: number;
+    /** 返回记录使用的图标在 icons 中的下标 */
+    getIcon?: (record: D, index: number) => number;
+}
+declare const ListView: <D extends object>(props: ListViewProps<D> & {
+    ref?: React.Ref<gui.HWND>;
+}) => React.ReactElement;
+export { ListView };

package/lib/react-qw/components/ListView.js

@@ -7,6 +7,8 @@ import { WCHAR } from '../../ffi/bind.js';
 import { nmCode } from '../nmhdr.js';
 import { LoadCursor, SetCursor, ScreenToClient, GetCursorPos } from '../../windows/user32.js';
 import { CreateFontIndirect, DeleteObject, GetObject, SelectObject } from '../../windows/gdi32.js';
+import { createBitmapFromPixels } from '../../bitmap.js';
+import { ImageListCreate, ImageListAdd, ImageListDestroy } from '../../windows/comctl32.js';
 import { LOGFONTW, POINT, NMCUSTOMDRAW, NMLVCUSTOMDRAW, NMLISTVIEW, LVHITTESTINFO, LVITEMW, LVCOLUMNW, } from '../../windows/structs.js';
 export function makeColorBlock(size, bgra) {
     const n = size * size;
@@ -134,27 +136,27 @@ function makeLVItem(i, sub, text, image) {
 }
 const ListView = forwardRef(function ListViewInner({ columns, data, style, icons, iconSize, getIcon }, ref) {
     const lvRef = useRef(null);
-    const iconListRef = useRef(0);
+    const iconListRef = useRef(NULL);
     useEffect(() => {
         const h = lvRef.current;
         if (!h)
             return;
         const il = iconListRef.current;
-        iconListRef.current = 0;
+        iconListRef.current = NULL;
         if (il) {
             gui.SendMessage(h, 4099 /* LvMsg.SETIMAGELIST */, 1 /* LvImageList.SMALL */, 0);
-            gui.ImageListDestroy(il);
+            ImageListDestroy(il);
         }
         if (!icons || icons.length === 0)
             return;
         const size = iconSize ?? 32;
-        const img = gui.ImageListCreate(size, size, 32 /* ImageListFlag.COLOR32 */, icons.length, 1);
+        const img = ImageListCreate(size, size, 32 /* ImageListFlag.COLOR32 */, icons.length, 1);
         if (!img)
             return;
         for (const p of icons) {
-            const hbm = gui.CreateBitmapFromPixels(size, size, p);
+            const hbm = createBitmapFromPixels(size, size, p);
             if (hbm) {
-                gui.ImageListAdd(img, hbm);
+                ImageListAdd(img, hbm, NULL);
                 DeleteObject(hbm);
             }
         }

package/lib/react-qw/components/PathPicker.d.ts

@@ -0,0 +1,23 @@
+import * as gui from 'gui';
+import type { WStyle } from '../jsx.d.ts';
+interface PathPickerBase {
+    type?: 'file' | 'folder';
+    filter?: string;
+    title?: string;
+    placeholder?: string;
+    disabled?: boolean;
+    style?: WStyle;
+}
+export type PathPickerProps = PathPickerBase & ({
+    multiple: true;
+    value?: string[];
+    defaultValue?: string[];
+    onChange?: (v: string[]) => void;
+} | {
+    multiple?: false;
+    value?: string;
+    defaultValue?: string;
+    onChange?: (v: string) => void;
+});
+export declare const PathPicker: import("react").ForwardRefExoticComponent<PathPickerProps & import("react").RefAttributes<gui.HWND>>;
+export {};

package/lib/react-qw/components/ProgressBar.d.ts

@@ -0,0 +1,9 @@
+import * as gui from 'gui';
+import type { WStyle } from '../jsx.d.ts';
+export interface ProgressBarProps {
+    value?: number;
+    max?: number;
+    style?: WStyle;
+    smooth?: boolean;
+}
+export declare const ProgressBar: import("react").ForwardRefExoticComponent<ProgressBarProps & import("react").RefAttributes<gui.HWND>>;

package/lib/react-qw/components/RadioButton.d.ts

@@ -0,0 +1,11 @@
+import * as gui from 'gui';
+import type { WStyle } from '../jsx.d.ts';
+export interface RadioButtonProps {
+    checked?: boolean;
+    defaultChecked?: boolean;
+    onChange?: (checked: boolean) => void;
+    label?: string;
+    style?: WStyle;
+    disabled?: boolean;
+}
+export declare const RadioButton: import("react").ForwardRefExoticComponent<RadioButtonProps & import("react").RefAttributes<gui.HWND>>;

package/lib/react-qw/components/ScrollView.d.ts

@@ -0,0 +1,9 @@
+import * as gui from 'gui';
+import type { WStyle } from '../jsx.d.ts';
+export interface ScrollViewProps {
+    children?: React.ReactNode;
+    style?: WStyle;
+    contentWidth?: number;
+    contentHeight?: number;
+}
+export declare const ScrollView: import("react").ForwardRefExoticComponent<ScrollViewProps & import("react").RefAttributes<gui.HWND>>;

package/lib/react-qw/components/ScrollView.js

@@ -1,10 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { forwardRef, useLayoutEffect, useRef } from 'react';
-import * as gui from 'gui';
-import { DefWindowProc, SetWindowPos, ShowScrollBar, GetDC, ReleaseDC } from '../../windows/user32.js';
-import { NULL } from '../../ffi/ctype.js';
-import { GetDeviceCaps } from '../../windows/gdi32.js';
+import { DefWindowProc, GetClientRect, GetScrollInfo, SetScrollInfo, SetWindowPos, ShowScrollBar } from '../../windows/user32.js';
+import { RECT, SCROLLINFO } from '../../windows/structs.js';
 import { forceFlexLayout } from '../reconciler.js';
+import { getScaleFactor } from '../../dpi.js';
 export const ScrollView = forwardRef(({ children, style, contentWidth, contentHeight }, ref) => {
     const svRef = useRef(null);
     const contentRef = useRef(null);
@@ -16,16 +15,13 @@ export const ScrollView = forwardRef(({ children, style, contentWidth, contentHe
     //   page  = viewportSize（可见行数）
     //   nPos  = 0 … max - page + 1（即 0 … contentSize - viewportSize）
     function updateScroll(sv, content) {
-        const svRect = gui.GetClientRect(sv);
-        if (!svRect)
+        const svBuf = RECT.alloc();
+        if (!GetClientRect(sv, svBuf.ptr))
             return;
-        const svW = svRect.right - svRect.left;
-        const svH = svRect.bottom - svRect.top;
-        // GetScaleFactor 等价内联：GetDC → GetDeviceCaps(LOGPIXELSX=88) → ReleaseDC 配对
-        const hdc = GetDC(NULL);
-        const scale = hdc ? GetDeviceCaps(hdc, 88) / 96 : 1;
-        if (hdc)
-            ReleaseDC(NULL, hdc);
+        const { left, top, right, bottom } = RECT.decode(svBuf);
+        const svW = right - left;
+        const svH = bottom - top;
+        const scale = getScaleFactor();
         const natW = Math.round((contentWidth ?? (svW / scale)) * scale);
         const natH = Math.round((contentHeight ?? (svH / scale)) * scale);
         scrollXRef.current = Math.max(0, Math.min(scrollXRef.current, natW - svW));
@@ -33,7 +29,10 @@ export const ScrollView = forwardRef(({ children, style, contentWidth, contentHe
         SetWindowPos(content, 0 /* SetWindowPosHwnd.TOP */, -scrollXRef.current, -scrollYRef.current, natW, natH, 4 /* SetWindowPosFlag.SWP_NOZORDER */);
         forceFlexLayout(content);
         if (natW > svW) {
-            gui.SetScrollInfo(sv, 0 /* ScrollBar.HORZ */, { min: 0, max: natW - 1, page: svW, pos: scrollXRef.current }, true);
+            SetScrollInfo(sv, 0 /* ScrollBar.HORZ */, {
+                cbSize: SCROLLINFO.size, fMask: 1 /* ScrollInfoFlag.RANGE */ | 2 /* ScrollInfoFlag.PAGE */ | 4 /* ScrollInfoFlag.POS */,
+                nMin: 0, nMax: natW - 1, nPage: svW, nPos: scrollXRef.current,
+            }, 1);
             ShowScrollBar(sv, 0 /* ScrollBar.HORZ */, 1);
         }
         else {
@@ -41,7 +40,10 @@ export const ScrollView = forwardRef(({ children, style, contentWidth, contentHe
             ShowScrollBar(sv, 0 /* ScrollBar.HORZ */, 0);
         }
         if (natH > svH) {
-            gui.SetScrollInfo(sv, 1 /* ScrollBar.VERT */, { min: 0, max: natH - 1, page: svH, pos: scrollYRef.current }, true);
+            SetScrollInfo(sv, 1 /* ScrollBar.VERT */, {
+                cbSize: SCROLLINFO.size, fMask: 1 /* ScrollInfoFlag.RANGE */ | 2 /* ScrollInfoFlag.PAGE */ | 4 /* ScrollInfoFlag.POS */,
+                nMin: 0, nMax: natH - 1, nPage: svH, nPos: scrollYRef.current,
+            }, 1);
             ShowScrollBar(sv, 1 /* ScrollBar.VERT */, 1);
         }
         else {
@@ -64,15 +66,17 @@ export const ScrollView = forwardRef(({ children, style, contentWidth, contentHe
             scrollXRef.current = newPos;
         }
         SetWindowPos(content, 0 /* SetWindowPosHwnd.TOP */, -scrollXRef.current, -scrollYRef.current, 0, 0, 1 /* SetWindowPosFlag.SWP_NOSIZE */ | 4 /* SetWindowPosFlag.SWP_NOZORDER */);
-        gui.SetScrollInfo(sv, bar, { pos: newPos }, true);
+        SetScrollInfo(sv, bar, { cbSize: SCROLLINFO.size, fMask: 4 /* ScrollInfoFlag.POS */, nPos: newPos }, 1);
     }
     function handleScroll(e, bar) {
         const sv = svRef.current;
         const content = contentRef.current;
         if (!sv || !content)
             return;
-        const info = gui.GetScrollInfo(sv, bar);
-        const maxPos = info.max - info.page + 1;
+        const si = SCROLLINFO.encode({ cbSize: SCROLLINFO.size, fMask: 23 /* ScrollInfoFlag.ALL */ });
+        GetScrollInfo(sv, bar, si.ptr);
+        const info = SCROLLINFO.decode(si);
+        const maxPos = info.nMax - info.nPage + 1;
         const code = e.wParam & 0xFFFF;
         const ref_ = bar === 1 /* ScrollBar.VERT */ ? scrollYRef : scrollXRef;
         let newPos = ref_.current;
@@ -84,9 +88,9 @@ export const ScrollView = forwardRef(({ children, style, contentWidth, contentHe
         else if (code === 1 /* ScrollCmd.LINEDOWN */)
             newPos += 20;
         else if (code === 2 /* ScrollCmd.PAGEUP */)
-            newPos -= info.page;
+            newPos -= info.nPage;
         else if (code === 3 /* ScrollCmd.PAGEDOWN */)
-            newPos += info.page;
+            newPos += info.nPage;
         else
             return;
         newPos = Math.max(0, Math.min(maxPos, newPos));
@@ -106,8 +110,10 @@ export const ScrollView = forwardRef(({ children, style, contentWidth, contentHe
         if (!isHorz && contentHeight === undefined)
             return;
         const bar = isHorz ? 0 /* ScrollBar.HORZ */ : 1 /* ScrollBar.VERT */;
-        const info = gui.GetScrollInfo(sv, bar);
-        const maxPos = info.max - info.page + 1;
+        const si = SCROLLINFO.encode({ cbSize: SCROLLINFO.size, fMask: 23 /* ScrollInfoFlag.ALL */ });
+        GetScrollInfo(sv, bar, si.ptr);
+        const info = SCROLLINFO.decode(si);
+        const maxPos = info.nMax - info.nPage + 1;
         const ref_ = isHorz ? scrollXRef : scrollYRef;
         let newPos = ref_.current + dy;
         newPos = Math.max(0, Math.min(maxPos, newPos));

package/lib/react-qw/components/Slider.d.ts

@@ -0,0 +1,12 @@
+import * as gui from 'gui';
+import type { WStyle } from '../jsx.d.ts';
+export interface SliderProps {
+    value: number;
+    onChange?: (value: number) => void;
+    min?: number;
+    max?: number;
+    vertical?: boolean;
+    disabled?: boolean;
+    style?: WStyle;
+}
+export declare const Slider: import("react").ForwardRefExoticComponent<SliderProps & import("react").RefAttributes<gui.HWND>>;

package/lib/react-qw/components/Tab.d.ts

@@ -0,0 +1,14 @@
+import { type ReactNode } from 'react';
+import * as gui from 'gui';
+import type { WStyle } from '../jsx.d.ts';
+export interface TabProps {
+    tabs: {
+        title: string;
+        content: ReactNode;
+    }[];
+    selectedIndex?: number;
+    defaultSelectedIndex?: number;
+    onChange?: (index: number) => void;
+    style?: WStyle;
+}
+export declare const Tab: import("react").ForwardRefExoticComponent<TabProps & import("react").RefAttributes<gui.HWND>>;

package/lib/react-qw/components/Tooltip.d.ts

@@ -0,0 +1,7 @@
+export interface TooltipProps {
+    text: string;
+    children: React.ReactElement;
+    balloon?: boolean;
+}
+declare function Tooltip({ text, children, balloon }: TooltipProps): import("react").ReactElement<Record<string, unknown>, string | import("react").JSXElementConstructor<any>>;
+export { Tooltip };

package/lib/react-qw/components/TreeView.d.ts

@@ -0,0 +1,18 @@
+import * as gui from 'gui';
+import type { WStyle } from '../jsx.d.ts';
+export interface TreeNode<D = unknown> {
+    key?: string;
+    label: string;
+    children?: TreeNode<D>[];
+}
+export interface TreeViewProps<D> {
+    data: TreeNode<D>[];
+    onSelect?: (node: TreeNode<D> | null) => void;
+    defaultSelectedKey?: string;
+    selectedKey?: string;
+    style?: WStyle;
+}
+declare const TreeView: <D = unknown>(props: TreeViewProps<D> & {
+    ref?: React.Ref<gui.HWND>;
+}) => React.ReactElement;
+export { TreeView };

package/lib/react-qw/components/index.d.ts

@@ -0,0 +1,16 @@
+export { Button, type ButtonProps } from './Button.js';
+export { CheckBox, type CheckBoxProps } from './CheckBox.js';
+export { ComboBox, type ComboBoxProps } from './ComboBox.js';
+export { DateTimePicker, type DateTimePickerProps } from './DateTimePicker.js';
+export { Input, type InputProps } from './Input.js';
+export { Link, type LinkProps } from './Link.js';
+export { ListBox, type ListBoxProps } from './ListBox.js';
+export { ListView, makeColorBlock, type ListViewProps, type Column, type CellStyle, type Align } from './ListView.js';
+export { ProgressBar, type ProgressBarProps } from './ProgressBar.js';
+export { RadioButton, type RadioButtonProps } from './RadioButton.js';
+export { ScrollView, type ScrollViewProps } from './ScrollView.js';
+export { Slider, type SliderProps } from './Slider.js';
+export { Tab, type TabProps } from './Tab.js';
+export { Tooltip, type TooltipProps } from './Tooltip.js';
+export { TreeView, type TreeViewProps, type TreeNode } from './TreeView.js';
+export { PathPicker, type PathPickerProps } from './PathPicker.js';

package/lib/react-qw/index.d.ts

@@ -0,0 +1,24 @@
+import * as gui from 'gui';
+import React from 'react';
+export interface RootWindowConfig {
+    text?: string;
+    ws?: number;
+    x?: number;
+    y?: number;
+    width?: number;
+    height?: number;
+    noShowWindow?: boolean;
+    onEvent?: (e: {
+        hwnd: gui.HWND;
+        msg: number;
+        wParam: number;
+        lParam: number;
+    }) => number | void;
+}
+export declare function createRoot(container: gui.HWND | RootWindowConfig): {
+    hwnd: gui.HWND;
+    render(element: React.ReactNode): void;
+    unmount(): void;
+};
+export * from './components/index.js';
+export declare function render(element: React.ReactNode, containerOrConfig?: gui.HWND | RootWindowConfig | null, _callback?: () => void): void;

package/lib/react-qw/index.js

@@ -1,5 +1,5 @@
 import * as gui from 'gui';
-import { DefWindowProc, GetSystemMetrics } from '../windows/user32.js';
+import { DefWindowProc, GetSystemMetrics, ShowWindow, UpdateWindow } from '../windows/user32.js';
 import reconciler, { scaleFactor, instancesByHwnd, forceFlexLayout } from './reconciler.js';
 const noop = () => { };
 let defaultClassRegistered = false;
@@ -34,8 +34,7 @@ export function createRoot(container) {
         const ws = (cfg.ws ?? 0) | 13565952 /* WindowStyle.OVERLAPPEDWINDOW */;
         const w = (cfg.width ?? 800) * scaleFactor;
         const h = (cfg.height ?? 600) * scaleFactor;
-        // GetScreenSize 等价内联：SM_CXSCREEN=0 / SM_CYSCREEN=1
-        const [sw, sh] = [GetSystemMetrics(0), GetSystemMetrics(1)];
+        const [sw, sh] = [GetSystemMetrics(0 /* SysMetrics.CXSCREEN */), GetSystemMetrics(1 /* SysMetrics.CYSCREEN */)];
         const x = cfg.x === undefined ? ((sw - w) / 2) | 0
             : cfg.x === -2147483648 /* CreatePos.USEDEFAULT */ ? -2147483648 /* CreatePos.USEDEFAULT */ : cfg.x * scaleFactor;
         const y = cfg.y === undefined ? ((sh - h) / 2) | 0
@@ -44,8 +43,11 @@ export function createRoot(container) {
         if (!hwin)
             throw new Error('CreateWindow failed');
         hwnd = hwin;
-        if (!cfg.noShowWindow)
-            gui.ShowWindow(hwnd);
+        // 启动首帧：ShowWindow 后立即 WM_PAINT，不留白（原 gui.ShowWindow 复合语义）
+        if (!cfg.noShowWindow) {
+            ShowWindow(hwnd, 1 /* ShowWindowCmd.SHOWNORMAL */);
+            UpdateWindow(hwnd);
+        }
     }
     else {
         hwnd = container;

package/lib/react-qw/layout.d.ts

@@ -0,0 +1,29 @@
+export type JustifyContent = 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around' | 'space-evenly';
+export interface FlexStyle {
+    flexDirection?: 'row' | 'column';
+    justifyContent?: JustifyContent;
+    alignItems?: 'flex-start' | 'flex-end' | 'center' | 'stretch';
+    gap?: number;
+    padding?: number;
+    paddingTop?: number;
+    paddingRight?: number;
+    paddingBottom?: number;
+    paddingLeft?: number;
+}
+interface ChildStyle {
+    width?: number | 'auto';
+    height?: number | 'auto';
+    flexGrow?: number;
+    alignSelf?: 'auto' | 'flex-start' | 'flex-end' | 'center' | 'stretch';
+}
+interface ChildInfo {
+    style: ChildStyle;
+}
+export interface LayoutResult {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+}
+export declare function calculateFlexLayout(flex: FlexStyle, parentW: number, parentH: number, children: ChildInfo[]): LayoutResult[];
+export {};

package/lib/react-qw/nmhdr.d.ts

@@ -0,0 +1 @@
+export declare function nmCode(lParam: number): number;

package/lib/react-qw/props.d.ts

@@ -0,0 +1,2 @@
+import type { Instance, Props } from './reconciler.js';
+export declare function applyProps(instance: Instance, newProps: Props, _oldProps: Props): void;

package/lib/react-qw/props.js

@@ -1,5 +1,5 @@
 import * as gui from 'gui';
-import { SetWindowText, EnableWindow } from '../windows/user32.js';
+import { SetWindowText, EnableWindow, ShowWindow } from '../windows/user32.js';
 export function applyProps(instance, newProps, _oldProps) {
     const hwnd = instance.hwnd;
     instance.props = newProps;
@@ -24,9 +24,9 @@ export function applyProps(instance, newProps, _oldProps) {
         EnableWindow(hwnd, !newProps.disabled ? 1 : 0);
     }
     if ('hidden' in newProps) {
-        gui.ShowWindow(hwnd, newProps.hidden ? 0 /* ShowWindowCmd.HIDE */ : 5 /* ShowWindowCmd.SHOW */);
+        ShowWindow(hwnd, newProps.hidden ? 0 /* ShowWindowCmd.HIDE */ : 5 /* ShowWindowCmd.SHOW */);
     }
     if ('visible' in newProps) {
-        gui.ShowWindow(hwnd, newProps.visible ? 5 /* ShowWindowCmd.SHOW */ : 0 /* ShowWindowCmd.HIDE */);
+        ShowWindow(hwnd, newProps.visible ? 5 /* ShowWindowCmd.SHOW */ : 0 /* ShowWindowCmd.HIDE */);
     }
 }

package/lib/react-qw/reconciler.d.ts

@@ -0,0 +1,21 @@
+import ReactReconciler from 'react-reconciler';
+import * as gui from 'gui';
+import type { WIntrinsicProps } from './jsx.js';
+export declare const scaleFactor: number;
+export type Props = WIntrinsicProps;
+export interface Instance {
+    hwnd: gui.HWND | null;
+    type: string;
+    props: Props;
+    children: Instance[];
+    lastRect?: {
+        x: number;
+        y: number;
+        w: number;
+        h: number;
+    };
+}
+export declare const instancesByHwnd: Map<gui.HWND, Instance>;
+export declare function forceFlexLayout(hwnd: gui.HWND): void;
+declare const reconciler: ReactReconciler.Reconciler<gui.HWND, Instance, Instance, never, never, gui.HWND>;
+export default reconciler;

package/lib/react-qw/reconciler.js

@@ -3,21 +3,15 @@ import { createContext } from 'react';
 import { DefaultEventPriority, NoEventPriority } from 'react-reconciler/constants';
 import * as gui from 'gui';
 import * as os from 'os';
-import { GetDC, ReleaseDC, GetWindowLongPtr, CallWindowProc, SetWindowPos, InvalidateRect, SetParent, SetWindowText } from '../windows/user32.js';
-import { GetDeviceCaps } from '../windows/gdi32.js';
+import { GetClientRect, GetWindowLongPtr, CallWindowProc, SetWindowPos, ShowWindow, InvalidateRect, SetParent, SetWindowText } from '../windows/user32.js';
+import { createSystemDpiFont, getScaleFactor } from '../dpi.js';
+import { RECT } from '../windows/structs.js';
 import { NULL } from '../ffi/ctype.js';
 import { applyProps } from './props.js';
 import { calculateFlexLayout } from './layout.js';
 import { getButtonIdealSize, measureTextForHwnd } from '../text-measure.js';
-const dpiFont = gui.CreateSystemDpiFont();
-// GetScaleFactor 等价内联：GetDC → GetDeviceCaps(LOGPIXELSX=88) → ReleaseDC 配对
-export const scaleFactor = (() => {
-    const hdc = GetDC(NULL);
-    const dpi = hdc ? GetDeviceCaps(hdc, 88) : 96;
-    if (hdc)
-        ReleaseDC(NULL, hdc);
-    return dpi / 96;
-})();
+const dpiFont = createSystemDpiFont();
+export const scaleFactor = getScaleFactor();
 const DELAYED_CONTROLS = new Set(['SysListView32', 'SysTreeView32', 'LISTBOX', 'COMBOBOX', 'msctls_trackbar32', 'SysDateTimePick32', 'SysLink']);
 function isDelayedControl(winClass) {
     return DELAYED_CONTROLS.has(winClass);
@@ -59,11 +53,12 @@ function runFlexLayout(inst) {
     const visible = children.filter(c => !c.props.hidden);
     if (visible.length === 0)
         return;
-    const rect = gui.GetClientRect(inst.hwnd);
-    if (!rect) {
+    const rcBuf = RECT.alloc();
+    if (!GetClientRect(inst.hwnd, rcBuf.ptr)) {
         console.log('flex: no rect for', inst.hwnd, inst.type);
         return;
     }
+    const rect = RECT.decode(rcBuf);
     const pw = (rect.right - rect.left) / scaleFactor;
     const ph = (rect.bottom - rect.top) / scaleFactor;
     if (pw <= 0 || ph <= 0) {
@@ -260,19 +255,19 @@ const hostConfig = {
     },
     hideInstance(instance) {
         if (instance.hwnd !== null)
-            gui.ShowWindow(instance.hwnd, 0 /* ShowWindowCmd.HIDE */);
+            ShowWindow(instance.hwnd, 0 /* ShowWindowCmd.HIDE */);
     },
     hideTextInstance(instance) {
         if (instance.hwnd !== null)
-            gui.ShowWindow(instance.hwnd, 0 /* ShowWindowCmd.HIDE */);
+            ShowWindow(instance.hwnd, 0 /* ShowWindowCmd.HIDE */);
     },
     unhideInstance(instance, _props) {
         if (instance.hwnd !== null)
-            gui.ShowWindow(instance.hwnd, 5 /* ShowWindowCmd.SHOW */);
+            ShowWindow(instance.hwnd, 5 /* ShowWindowCmd.SHOW */);
     },
     unhideTextInstance(instance, _text) {
         if (instance.hwnd !== null)
-            gui.ShowWindow(instance.hwnd, 5 /* ShowWindowCmd.SHOW */);
+            ShowWindow(instance.hwnd, 5 /* ShowWindowCmd.SHOW */);
     },
     shouldSetTextContent(_type, props) {
         return typeof props.children === 'string' || typeof props.children === 'number';

package/lib/stream.d.ts

@@ -0,0 +1,20 @@
+export {};
+import { ReadableStream as ReadableStreamImpl, ReadableStreamDefaultController as ReadableStreamDefaultControllerImpl, ReadableStreamDefaultReader as ReadableStreamDefaultReaderImpl } from './vendor/web-streams/ponyfill.mjs';
+declare global {
+    type ReadableStreamReadResult<R = any> = {
+        done: false;
+        value: R;
+    } | {
+        done: true;
+        value?: undefined;
+    };
+    interface ReadableStreamReader<R = any> extends ReadableStreamDefaultReaderImpl<R> {
+    }
+    interface ReadableStreamDefaultReader<R = any> extends ReadableStreamDefaultReaderImpl<R> {
+    }
+    interface ReadableStream<R = any> extends ReadableStreamImpl<R> {
+    }
+    interface ReadableStreamDefaultController<R = any> extends ReadableStreamDefaultControllerImpl<R> {
+    }
+    var ReadableStream: typeof ReadableStreamImpl;
+}

package/lib/text-codec.d.ts

@@ -0,0 +1,39 @@
+export {};
+declare global {
+    interface TextDecoder<T extends _Label | undefined = _Label | undefined> extends TextDecoderImpl<T> {
+    }
+    var TextDecoder: typeof TextDecoderImpl;
+    interface TextEncoder<T extends _Label | undefined = _Label | undefined> extends TextEncoderImpl<T> {
+    }
+    var TextEncoder: typeof TextEncoderImpl;
+}
+declare const _labelMap: {
+    readonly 'utf-8': 'utf-8';
+    readonly utf8: 'utf-8';
+    readonly 'unicode-1-1-utf-8': 'utf-8';
+    readonly 'utf-16': 'utf-16le';
+    readonly 'utf-16le': 'utf-16le';
+    readonly 'utf-16be': 'utf-16be';
+};
+type _Label = keyof typeof _labelMap;
+type _Encoding = typeof _labelMap[_Label];
+type _Result<T> = T extends _Label ? typeof _labelMap[T] : 'utf-8';
+declare class TextDecoderImpl<T extends _Label | undefined = _Label | undefined> {
+    _encoding: _Encoding;
+    _fatal: boolean;
+    _ignoreBOM: boolean;
+    constructor(label?: T, options?: {
+        fatal?: boolean;
+        ignoreBOM?: boolean;
+    });
+    get encoding(): _Result<T>;
+    get fatal(): boolean;
+    get ignoreBOM(): boolean;
+    decode(buffer?: ArrayBufferView | ArrayBuffer | null): string;
+}
+declare class TextEncoderImpl<T extends _Label | undefined = _Label | undefined> {
+    _encoding: _Encoding;
+    constructor(label?: T);
+    get encoding(): _Result<T>;
+    encode(input?: string): Uint8Array<ArrayBuffer>;
+}

package/lib/text-measure.d.ts

@@ -0,0 +1,14 @@
+import { type Ptr } from './ffi/ctype.js';
+import * as gui from 'gui';
+export declare function measureText(hdc: Ptr<'HDC'>, text: string, maxWidth: number): {
+    width: number;
+    height: number;
+};
+export declare function getButtonIdealSize(hwnd: gui.HWND): {
+    width: number;
+    height: number;
+};
+export declare function measureTextForHwnd(hwnd: gui.HWND, text: string): {
+    width: number;
+    height: number;
+};

package/lib/text-measure.js

@@ -1,6 +1,6 @@
 import { NULL } from './ffi/ctype.js';
 import * as gui from 'gui';
-import { DrawText, GetDC, ReleaseDC } from './windows/user32.js';
+import { DrawText, GetDC, GetClientRect, GetWindowRect, ReleaseDC } from './windows/user32.js';
 import { SelectObject } from './windows/gdi32.js';
 import { RECT, SIZE } from './windows/structs.js';
 export function measureText(hdc, text, maxWidth) {
@@ -29,11 +29,14 @@ export function measureTextForHwnd(hwnd, text) {
     if (hFont)
         SelectObject(hdc, oldFont);
     ReleaseDC(hwnd, hdc);
-    const wr = gui.GetWindowRect(hwnd);
-    const cr = gui.GetClientRect(hwnd);
-    if (wr && cr) {
-        result.width += (wr.right - wr.left) - (cr.right - cr.left);
-        result.height += (wr.bottom - wr.top) - (cr.bottom - cr.top);
+    const wr = RECT.alloc();
+    const cr = RECT.alloc();
+    const okWr = GetWindowRect(hwnd, wr.ptr);
+    const okCr = GetClientRect(hwnd, cr.ptr);
+    if (okWr && okCr) {
+        const w = RECT.decode(wr), c = RECT.decode(cr);
+        result.width += (w.right - w.left) - (c.right - c.left);
+        result.height += (w.bottom - w.top) - (c.bottom - c.top);
     }
     return result;
 }