quickwin 2.2.0 → 2.3.0

package/examples/test_root_window.js

@@ -16560,6 +16560,14 @@ var LVCOLUMNW_DECL = {
   cxIdeal: "i32"
 };
 var LVCOLUMNW = /* @__PURE__ */ struct("LVCOLUMNW", LVCOLUMNW_DECL);
+var NOTIFYICONIDENTIFIER_DECL = {
+  "#": "struct",
+  cbSize: "u32",
+  hWnd: "<HWND>ptr",
+  uID: "u32",
+  guidItem: "u32[4]"
+};
+var NOTIFYICONIDENTIFIER = /* @__PURE__ */ struct("NOTIFYICONIDENTIFIER", NOTIFYICONIDENTIFIER_DECL);
 
 // _build/lib/windows/user32.js
 var b = (name, sig, encoders) => bind("user32.dll", name, sig, encoders);
@@ -16625,14 +16633,14 @@ function applyProps(instance, newProps, _oldProps) {
     gui.ShowWindow(
       hwnd,
       newProps.hidden ? 0 : 5
-      /* gui.ShowWindowCmd.SHOW */
+      /* ShowWindowCmd.SHOW */
     );
   }
   if ("visible" in newProps) {
     gui.ShowWindow(
       hwnd,
       newProps.visible ? 5 : 0
-      /* gui.ShowWindowCmd.HIDE */
+      /* ShowWindowCmd.HIDE */
     );
   }
 }
@@ -16728,7 +16736,7 @@ function measureText(hdc, text, maxWidth) {
     -1,
     r.ptr,
     1024
-    /* gui.DrawTextFlag.CALCRECT */
+    /* DrawTextFlag.CALCRECT */
   );
   const { right, bottom } = RECT.decode(r);
   return { width: right, height: bottom };
@@ -16776,7 +16784,7 @@ function setupWindowProc(instance, hwnd) {
   const oldProc = GetWindowLongPtr(
     hwnd,
     -4
-    /* gui.Gwlp.WNDPROC */
+    /* Gwlp.WNDPROC */
   );
   instancesByHwnd.set(hwnd, instance);
   gui3.SetWindowProc(hwnd, (hwnd2, msg, wParam, lParam) => {
@@ -16864,7 +16872,7 @@ function runFlexLayout(inst) {
       r.width * scaleFactor,
       r.height * scaleFactor,
       64
-      /* gui.SetWindowPosFlag.SWP_SHOWWINDOW */
+      /* SetWindowPosFlag.SWP_SHOWWINDOW */
     );
     InvalidateRect(child.hwnd, NULL, 1);
     child.lastRect = { x: r.x, y: r.y, w: r.width, h: r.height };
@@ -17020,7 +17028,7 @@ var hostConfig = {
       gui3.ShowWindow(
         instance.hwnd,
         0
-        /* gui.ShowWindowCmd.HIDE */
+        /* ShowWindowCmd.HIDE */
       );
   },
   hideTextInstance(instance) {
@@ -17028,7 +17036,7 @@ var hostConfig = {
       gui3.ShowWindow(
         instance.hwnd,
         0
-        /* gui.ShowWindowCmd.HIDE */
+        /* ShowWindowCmd.HIDE */
       );
   },
   unhideInstance(instance, _props) {
@@ -17036,7 +17044,7 @@ var hostConfig = {
       gui3.ShowWindow(
         instance.hwnd,
         5
-        /* gui.ShowWindowCmd.SHOW */
+        /* ShowWindowCmd.SHOW */
       );
   },
   unhideTextInstance(instance, _text) {
@@ -17044,7 +17052,7 @@ var hostConfig = {
       gui3.ShowWindow(
         instance.hwnd,
         5
-        /* gui.ShowWindowCmd.SHOW */
+        /* ShowWindowCmd.SHOW */
       );
   },
   shouldSetTextContent(_type, props) {
@@ -17472,7 +17480,7 @@ function getCellFont(hwnd, style) {
     ...base,
     ...style.bold ? {
       lfWeight: 700
-      /* gui.FontWeight.BOLD */
+      /* FontWeight.BOLD */
     } : {},
     ...style.italic ? { lfItalic: 1 } : {},
     ...style.underline ? { lfUnderline: 1 } : {}
@@ -17594,7 +17602,7 @@ var ListView = (0, import_react9.forwardRef)(function ListViewInner({ columns, d
       4150,
       0,
       32 | 1 | 65536
-      /* gui.LvExStyle.DOUBLEBUFFER */
+      /* LvExStyle.DOUBLEBUFFER */
     );
     const n = columns.length;
     for (let j = 0; j < n; j++) {
@@ -17639,7 +17647,7 @@ var ListView = (0, import_react9.forwardRef)(function ListViewInner({ columns, d
           4126,
           j,
           -2
-          /* gui.LvColumnWidthCmd.AUTOSIZE_USEHEADER */
+          /* LvColumnWidthCmd.AUTOSIZE_USEHEADER */
         );
       }
     }
@@ -17781,7 +17789,7 @@ var ScrollView = (0, import_react12.forwardRef)(({ children, style, contentWidth
       natW,
       natH,
       4
-      /* gui.SetWindowPosFlag.SWP_NOZORDER */
+      /* SetWindowPosFlag.SWP_NOZORDER */
     );
     forceFlexLayout(content);
     if (natW > svW) {
@@ -17820,7 +17828,7 @@ var ScrollView = (0, import_react12.forwardRef)(({ children, style, contentWidth
       0,
       0,
       1 | 4
-      /* gui.SetWindowPosFlag.SWP_NOZORDER */
+      /* SetWindowPosFlag.SWP_NOZORDER */
     );
     gui12.SetScrollInfo(sv, bar, { pos: newPos }, true);
   }
@@ -17886,7 +17894,7 @@ var ScrollView = (0, import_react12.forwardRef)(({ children, style, contentWidth
         handleScroll(
           e,
           1
-          /* gui.ScrollBar.VERT */
+          /* ScrollBar.VERT */
         );
         return 0;
       }
@@ -17894,7 +17902,7 @@ var ScrollView = (0, import_react12.forwardRef)(({ children, style, contentWidth
         handleScroll(
           e,
           0
-          /* gui.ScrollBar.HORZ */
+          /* ScrollBar.HORZ */
         );
         return 0;
       }
@@ -18058,7 +18066,7 @@ function deleteAllItems(hTree) {
       4353,
       1,
       -65536
-      /* gui.TvInsertAfter.ROOT */
+      /* TvInsertAfter.ROOT */
     );
 }
 var TreeView = (0, import_react16.forwardRef)(function TreeViewInner({ data, onSelect, defaultSelectedKey, selectedKey: controlledKey, style }, ref) {
@@ -18090,7 +18098,7 @@ var TreeView = (0, import_react16.forwardRef)(function TreeViewInner({ data, onS
       4396,
       0,
       4
-      /* gui.TvExStyle.DOUBLEBUFFER */
+      /* TvExStyle.DOUBLEBUFFER */
     );
   }, []);
   (0, import_react16.useEffect)(() => {
@@ -18132,9 +18140,16 @@ var b3 = (name, sig) => bind("comdlg32.dll", name, sig);
 var GetOpenFileName = /* @__PURE__ */ b3("GetOpenFileNameW", "<OPENFILENAMEW>ptr -> u32");
 
 // _build/lib/windows/shell32.js
-var b4 = (name, sig) => bind("shell32.dll", name, sig);
+var b4 = (name, sig, encoders) => bind("shell32.dll", name, sig, encoders);
 var SHBrowseForFolder = /* @__PURE__ */ b4("SHBrowseForFolderW", "<BROWSEINFOW>ptr -> <>ptr");
 var SHGetPathFromIDList = /* @__PURE__ */ b4("SHGetPathFromIDListW", "<>ptr <BYTE>ptr -> u32");
+var Shell_NotifyIconGetRect = (() => {
+  try {
+    return b4("Shell_NotifyIconGetRect", "<NOTIFYICONIDENTIFIER>ptr <RECT>ptr -> i32", { NOTIFYICONIDENTIFIER });
+  } catch {
+    return null;
+  }
+})();
 
 // _build/lib/windows/ole32.js
 var b5 = (name, sig) => bind("ole32.dll", name, sig);

package/examples/test_root_window.tsx

@@ -1,14 +1,14 @@
 import '../lib/polyfill.js'
 import { useState } from 'react'
 import { Button, Input, createRoot } from '../lib/react-qw/index.js'
-import * as gui from 'gui'
+import { WindowStyle } from '../constants'
 
 function Counter() {
   const [count, setCount] = useState(0)
   return (
-    <w type="STATIC" ws={gui.WindowStyle.VISIBLE}
+    <w type="STATIC" ws={WindowStyle.VISIBLE}
       style={{ flexDirection: 'column', gap: 8, flexGrow: 1 }}>
-      <w type="STATIC" ws={gui.WindowStyle.VISIBLE}
+      <w type="STATIC" ws={WindowStyle.VISIBLE}
         style={{ flexDirection: 'row', alignItems: 'center', gap: 8 }}>
         <Button onClick={() => setCount(c => c + 1)}>Count: {count}</Button>
         <Button onClick={() => setCount(0)}>Reset</Button>
@@ -23,10 +23,10 @@ function Logger() {
   const [logs, setLogs] = useState<string[]>([])
   const add = () => setLogs(prev => [...prev, `log ${prev.length + 1}`])
   return (
-    <w type="STATIC" ws={gui.WindowStyle.VISIBLE}
+    <w type="STATIC" ws={WindowStyle.VISIBLE}
       style={{ flexDirection: 'column', gap: 8, flexGrow: 1 }}>
       <Button onClick={add}>Add Log</Button>
-      <w type="STATIC" ws={gui.WindowStyle.VISIBLE}
+      <w type="STATIC" ws={WindowStyle.VISIBLE}
         style={{ flexDirection: 'column', gap: 4, flexGrow: 1 }}>
         {logs.map((l, i) => <w key={String(i)} type="STATIC" text={l} />)}
       </w>

package/examples/test_tab.js

@@ -16561,6 +16561,14 @@ var LVCOLUMNW_DECL = {
   cxIdeal: "i32"
 };
 var LVCOLUMNW = /* @__PURE__ */ struct("LVCOLUMNW", LVCOLUMNW_DECL);
+var NOTIFYICONIDENTIFIER_DECL = {
+  "#": "struct",
+  cbSize: "u32",
+  hWnd: "<HWND>ptr",
+  uID: "u32",
+  guidItem: "u32[4]"
+};
+var NOTIFYICONIDENTIFIER = /* @__PURE__ */ struct("NOTIFYICONIDENTIFIER", NOTIFYICONIDENTIFIER_DECL);
 
 // _build/lib/windows/user32.js
 var b = (name, sig, encoders) => bind("user32.dll", name, sig, encoders);
@@ -16626,14 +16634,14 @@ function applyProps(instance, newProps, _oldProps) {
     gui.ShowWindow(
       hwnd2,
       newProps.hidden ? 0 : 5
-      /* gui.ShowWindowCmd.SHOW */
+      /* ShowWindowCmd.SHOW */
     );
   }
   if ("visible" in newProps) {
     gui.ShowWindow(
       hwnd2,
       newProps.visible ? 5 : 0
-      /* gui.ShowWindowCmd.HIDE */
+      /* ShowWindowCmd.HIDE */
     );
   }
 }
@@ -16729,7 +16737,7 @@ function measureText(hdc, text, maxWidth) {
     -1,
     r.ptr,
     1024
-    /* gui.DrawTextFlag.CALCRECT */
+    /* DrawTextFlag.CALCRECT */
   );
   const { right, bottom } = RECT.decode(r);
   return { width: right, height: bottom };
@@ -16777,7 +16785,7 @@ function setupWindowProc(instance, hwnd2) {
   const oldProc = GetWindowLongPtr(
     hwnd2,
     -4
-    /* gui.Gwlp.WNDPROC */
+    /* Gwlp.WNDPROC */
   );
   instancesByHwnd.set(hwnd2, instance);
   gui3.SetWindowProc(hwnd2, (hwnd3, msg, wParam, lParam) => {
@@ -16865,7 +16873,7 @@ function runFlexLayout(inst) {
       r.width * scaleFactor,
       r.height * scaleFactor,
       64
-      /* gui.SetWindowPosFlag.SWP_SHOWWINDOW */
+      /* SetWindowPosFlag.SWP_SHOWWINDOW */
     );
     InvalidateRect(child.hwnd, NULL, 1);
     child.lastRect = { x: r.x, y: r.y, w: r.width, h: r.height };
@@ -17021,7 +17029,7 @@ var hostConfig = {
       gui3.ShowWindow(
         instance.hwnd,
         0
-        /* gui.ShowWindowCmd.HIDE */
+        /* ShowWindowCmd.HIDE */
       );
   },
   hideTextInstance(instance) {
@@ -17029,7 +17037,7 @@ var hostConfig = {
       gui3.ShowWindow(
         instance.hwnd,
         0
-        /* gui.ShowWindowCmd.HIDE */
+        /* ShowWindowCmd.HIDE */
       );
   },
   unhideInstance(instance, _props) {
@@ -17037,7 +17045,7 @@ var hostConfig = {
       gui3.ShowWindow(
         instance.hwnd,
         5
-        /* gui.ShowWindowCmd.SHOW */
+        /* ShowWindowCmd.SHOW */
       );
   },
   unhideTextInstance(instance, _text) {
@@ -17045,7 +17053,7 @@ var hostConfig = {
       gui3.ShowWindow(
         instance.hwnd,
         5
-        /* gui.ShowWindowCmd.SHOW */
+        /* ShowWindowCmd.SHOW */
       );
   },
   shouldSetTextContent(_type, props) {
@@ -17473,7 +17481,7 @@ function getCellFont(hwnd2, style) {
     ...base,
     ...style.bold ? {
       lfWeight: 700
-      /* gui.FontWeight.BOLD */
+      /* FontWeight.BOLD */
     } : {},
     ...style.italic ? { lfItalic: 1 } : {},
     ...style.underline ? { lfUnderline: 1 } : {}
@@ -17595,7 +17603,7 @@ var ListView = (0, import_react9.forwardRef)(function ListViewInner({ columns, d
       4150,
       0,
       32 | 1 | 65536
-      /* gui.LvExStyle.DOUBLEBUFFER */
+      /* LvExStyle.DOUBLEBUFFER */
     );
     const n = columns.length;
     for (let j = 0; j < n; j++) {
@@ -17640,7 +17648,7 @@ var ListView = (0, import_react9.forwardRef)(function ListViewInner({ columns, d
           4126,
           j,
           -2
-          /* gui.LvColumnWidthCmd.AUTOSIZE_USEHEADER */
+          /* LvColumnWidthCmd.AUTOSIZE_USEHEADER */
         );
       }
     }
@@ -17782,7 +17790,7 @@ var ScrollView = (0, import_react12.forwardRef)(({ children, style, contentWidth
       natW,
       natH,
       4
-      /* gui.SetWindowPosFlag.SWP_NOZORDER */
+      /* SetWindowPosFlag.SWP_NOZORDER */
     );
     forceFlexLayout(content);
     if (natW > svW) {
@@ -17821,7 +17829,7 @@ var ScrollView = (0, import_react12.forwardRef)(({ children, style, contentWidth
       0,
       0,
       1 | 4
-      /* gui.SetWindowPosFlag.SWP_NOZORDER */
+      /* SetWindowPosFlag.SWP_NOZORDER */
     );
     gui12.SetScrollInfo(sv, bar, { pos: newPos }, true);
   }
@@ -17887,7 +17895,7 @@ var ScrollView = (0, import_react12.forwardRef)(({ children, style, contentWidth
         handleScroll(
           e,
           1
-          /* gui.ScrollBar.VERT */
+          /* ScrollBar.VERT */
         );
         return 0;
       }
@@ -17895,7 +17903,7 @@ var ScrollView = (0, import_react12.forwardRef)(({ children, style, contentWidth
         handleScroll(
           e,
           0
-          /* gui.ScrollBar.HORZ */
+          /* ScrollBar.HORZ */
         );
         return 0;
       }
@@ -18059,7 +18067,7 @@ function deleteAllItems(hTree) {
       4353,
       1,
       -65536
-      /* gui.TvInsertAfter.ROOT */
+      /* TvInsertAfter.ROOT */
     );
 }
 var TreeView = (0, import_react16.forwardRef)(function TreeViewInner({ data, onSelect, defaultSelectedKey, selectedKey: controlledKey, style }, ref) {
@@ -18091,7 +18099,7 @@ var TreeView = (0, import_react16.forwardRef)(function TreeViewInner({ data, onS
       4396,
       0,
       4
-      /* gui.TvExStyle.DOUBLEBUFFER */
+      /* TvExStyle.DOUBLEBUFFER */
     );
   }, []);
   (0, import_react16.useEffect)(() => {
@@ -18133,9 +18141,16 @@ var b3 = (name, sig) => bind("comdlg32.dll", name, sig);
 var GetOpenFileName = /* @__PURE__ */ b3("GetOpenFileNameW", "<OPENFILENAMEW>ptr -> u32");
 
 // _build/lib/windows/shell32.js
-var b4 = (name, sig) => bind("shell32.dll", name, sig);
+var b4 = (name, sig, encoders) => bind("shell32.dll", name, sig, encoders);
 var SHBrowseForFolder = /* @__PURE__ */ b4("SHBrowseForFolderW", "<BROWSEINFOW>ptr -> <>ptr");
 var SHGetPathFromIDList = /* @__PURE__ */ b4("SHGetPathFromIDListW", "<>ptr <BYTE>ptr -> u32");
+var Shell_NotifyIconGetRect = (() => {
+  try {
+    return b4("Shell_NotifyIconGetRect", "<NOTIFYICONIDENTIFIER>ptr <RECT>ptr -> i32", { NOTIFYICONIDENTIFIER });
+  } catch {
+    return null;
+  }
+})();
 
 // _build/lib/windows/ole32.js
 var b5 = (name, sig) => bind("ole32.dll", name, sig);

package/examples/test_tab.tsx

@@ -2,10 +2,11 @@ import '../lib/polyfill.js'
 import * as gui from 'gui'
 import { useState } from 'react'
 import { render, Button, Tab } from '../lib/react-qw/index.js'
+import { WindowStyle, WmMsg } from '../constants'
 
 gui.RegisterClass('TabDemo', (hwnd, msg, wParam, lParam) => {
   if (!hwnd) return gui.DefWindowProc(hwnd, msg, wParam, lParam)
-  if (msg === gui.WmMsg.DESTROY) {
+  if (msg === WmMsg.DESTROY) {
     gui.PostQuitMessage(0)
     return 0
   }
@@ -17,7 +18,7 @@ function App() {
 
   return (
     <w type="STATIC"
-      ws={gui.WindowStyle.VISIBLE}
+      ws={WindowStyle.VISIBLE}
       style={{ flexDirection: 'column', width: 600, height: 400, padding: 10 }}
     >
       <Tab
@@ -26,7 +27,7 @@ function App() {
             title: 'Counter',
             content: (
               <w type="STATIC" 
-              ws={gui.WindowStyle.VISIBLE | gui.WindowStyle.CLIPCHILDREN} 
+              ws={WindowStyle.VISIBLE | WindowStyle.CLIPCHILDREN} 
                style={{ flexDirection: 'column', gap: 10, padding: 10, width: 580, height: 300 }}>
                 <Button onClick={() => setTabIndex(1)}>Go to Tab 2</Button>
               </w>
@@ -36,7 +37,7 @@ function App() {
             title: 'Buttons',
             content: (
               <w type="STATIC"
-              ws={gui.WindowStyle.VISIBLE | gui.WindowStyle.CLIPCHILDREN} 
+              ws={WindowStyle.VISIBLE | WindowStyle.CLIPCHILDREN} 
                style={{ flexDirection: 'row', gap: 10, padding: 10, width: 580, height: 300, alignItems: 'stretch' }}>
                 <Button onClick={() => setTabIndex(2)}>Go to Tab 3</Button>
                 <Button onClick={() => setTabIndex(0)} style={{ width: 120 }}>Back</Button>
@@ -47,7 +48,7 @@ function App() {
             title: 'Final',
             content: (
               <w type="STATIC"
-              ws={gui.WindowStyle.VISIBLE | gui.WindowStyle.CLIPCHILDREN} 
+              ws={WindowStyle.VISIBLE | WindowStyle.CLIPCHILDREN} 
               style={{ flexDirection: 'column', gap: 10, padding: 10, width: 580, height: 300 }}>
                 <Button onClick={() => setTabIndex(0)}>Back to Tab 1</Button>
                 <Button onClick={() => setTabIndex(1)}>Back to Tab 2</Button>
@@ -65,7 +66,7 @@ function App() {
 
 const hwnd = gui.CreateWindow(
   'TabDemo', 'Tab Demo',
-  gui.WindowStyle.OVERLAPPEDWINDOW,
+  WindowStyle.OVERLAPPEDWINDOW,
   100, 100, 640, 480, null, null
 )
 

package/examples/tray_demo.js

@@ -24,14 +24,14 @@ gui.RegisterClass('TrayApp', (hwnd, msg, wParam, lParam) => {
                     gui.ShowWindow(hwnd, 5); // SW_SHOW
                 }
                 else if (cmd === 2) {
-                    gui.ShellNotifyIcon(2 /* gui.NotifyIconCmd.DELETE */, { hwnd, uID: 1 });
+                    gui.ShellNotifyIcon(2 /* NotifyIconCmd.DELETE */, { hwnd, uID: 1 });
                     gui.PostQuitMessage(0);
                 }
             }
         }
         return 0;
     }
-    if (msg === 16 /* gui.WmMsg.CLOSE */) {
+    if (msg === 16 /* WmMsg.CLOSE */) {
         gui.ShowWindow(hwnd, 0); // SW_HIDE
         return 0;
     }
@@ -42,14 +42,14 @@ const W = 500, H = 400;
 const scr = gui.GetScreenSize();
 const x = (scr[0] - W) >> 1;
 const y = (scr[1] - H) >> 1;
-const hwnd = gui.CreateWindow('TrayApp', '系统托盘示例', 13565952 /* gui.WindowStyle.OVERLAPPEDWINDOW */, x, y, W, H, null, null);
+const hwnd = gui.CreateWindow('TrayApp', '系统托盘示例', 13565952 /* WindowStyle.OVERLAPPEDWINDOW */, x, y, W, H, null, null);
 if (!hwnd)
     std.exit(0);
 gui.ShowWindow(hwnd);
 // 添加说明文字
 const ES_MULTILINE = 0x0004;
 const ES_READONLY = 0x0800;
-const style = 1073741824 /* gui.WindowStyle.CHILD */ | 268435456 /* gui.WindowStyle.VISIBLE */ | ES_MULTILINE | ES_READONLY;
+const style = 1073741824 /* WindowStyle.CHILD */ | 268435456 /* WindowStyle.VISIBLE */ | ES_MULTILINE | ES_READONLY;
 const text = gui.CreateWindow('EDIT', 'QuickWin 系统托盘示例\r\n'
     + '\r\n'
     + '右键点击托盘图标打开上下文菜单。\r\n'
@@ -58,15 +58,15 @@ const text = gui.CreateWindow('EDIT', 'QuickWin 系统托盘示例\r\n'
 if (text) {
     const font = gui.CreateSystemDpiFont();
     if (font)
-        gui.SendMessage(text, 48 /* gui.WmMsg.SETFONT */, font, 1);
+        gui.SendMessage(text, 48 /* WmMsg.SETFONT */, font, 1);
 }
 let hIcon = gui.LoadAppIcon();
 if (!hIcon)
-    hIcon = gui.LoadImage(null, 32512 /* gui.IDI.APPLICATION */, 1 /* gui.ImageType.ICON */, 0, 0, 32768 /* gui.LoadImageFlag.SHARED */);
+    hIcon = gui.LoadImage(null, 32512 /* IDI.APPLICATION */, 1 /* ImageType.ICON */, 0, 0, 32768 /* LoadImageFlag.SHARED */);
 if (hIcon) {
-    const ok = gui.ShellNotifyIcon(0 /* gui.NotifyIconCmd.ADD */, {
+    const ok = gui.ShellNotifyIcon(0 /* NotifyIconCmd.ADD */, {
         hwnd: hwnd, uID: 1,
-        flags: 1 /* gui.NotifyIconFlag.MESSAGE */ | 2 /* gui.NotifyIconFlag.ICON */,
+        flags: 1 /* NotifyIconFlag.MESSAGE */ | 2 /* NotifyIconFlag.ICON */,
         callbackMessage: WM_TRAY,
         hIcon,
     });

package/examples/tray_demo.tsx

@@ -1,5 +1,6 @@
 import * as gui from 'gui'
 import * as std from 'std'
+import { IDI, ImageType, LoadImageFlag, NotifyIconCmd, NotifyIconFlag, WindowStyle, WmMsg } from '../constants'
 
 const WM_TRAY = 0x8001
 
@@ -24,14 +25,14 @@ gui.RegisterClass('TrayApp', (hwnd, msg, wParam, lParam) => {
                 if (cmd === 1) {
                     gui.ShowWindow(hwnd, 5) // SW_SHOW
                 } else if (cmd === 2) {
-                    gui.ShellNotifyIcon(gui.NotifyIconCmd.DELETE, { hwnd, uID: 1 })
+                    gui.ShellNotifyIcon(NotifyIconCmd.DELETE, { hwnd, uID: 1 })
                     gui.PostQuitMessage(0)
                 }
             }
         }
         return 0
     }
-    if (msg === gui.WmMsg.CLOSE) {
+    if (msg === WmMsg.CLOSE) {
         gui.ShowWindow(hwnd, 0) // SW_HIDE
         return 0
     }
@@ -43,14 +44,14 @@ const W = 500, H = 400
 const scr = gui.GetScreenSize()
 const x = (scr[0] - W) >> 1
 const y = (scr[1] - H) >> 1
-const hwnd = gui.CreateWindow('TrayApp', '系统托盘示例', gui.WindowStyle.OVERLAPPEDWINDOW, x, y, W, H, null, null)
+const hwnd = gui.CreateWindow('TrayApp', '系统托盘示例', WindowStyle.OVERLAPPEDWINDOW, x, y, W, H, null, null)
 if (!hwnd) std.exit(0)
 gui.ShowWindow(hwnd)
 
 // 添加说明文字
 const ES_MULTILINE = 0x0004
 const ES_READONLY = 0x0800
-const style = gui.WindowStyle.CHILD | gui.WindowStyle.VISIBLE | ES_MULTILINE | ES_READONLY
+const style = WindowStyle.CHILD | WindowStyle.VISIBLE | ES_MULTILINE | ES_READONLY
 const text = gui.CreateWindow('EDIT',
     'QuickWin 系统托盘示例\r\n'
     + '\r\n'
@@ -61,15 +62,15 @@ const text = gui.CreateWindow('EDIT',
 if (text) {
     const font = gui.CreateSystemDpiFont()
     if (font)
-        gui.SendMessage(text, gui.WmMsg.SETFONT, font, 1)
+        gui.SendMessage(text, WmMsg.SETFONT, font, 1)
 }
 
 let hIcon = gui.LoadAppIcon()
-if (!hIcon) hIcon = gui.LoadImage(null, gui.IDI.APPLICATION, gui.ImageType.ICON, 0, 0, gui.LoadImageFlag.SHARED)
+if (!hIcon) hIcon = gui.LoadImage(null, IDI.APPLICATION, ImageType.ICON, 0, 0, LoadImageFlag.SHARED)
 if (hIcon) {
-    const ok = gui.ShellNotifyIcon(gui.NotifyIconCmd.ADD, {
+    const ok = gui.ShellNotifyIcon(NotifyIconCmd.ADD, {
         hwnd: hwnd, uID: 1,
-        flags: gui.NotifyIconFlag.MESSAGE | gui.NotifyIconFlag.ICON,
+        flags: NotifyIconFlag.MESSAGE | NotifyIconFlag.ICON,
         callbackMessage: WM_TRAY,
         hIcon,
     })

package/lib/dumpRects.js

@@ -2,7 +2,7 @@ import * as os from 'os';
 import * as gui from 'gui';
 export function startDumpRects(rootHwnd, intervalMs = 3000) {
     function dumpChild(parent, indent) {
-        var ch = gui.GetWindow(parent, 5 /* gui.GetWindowCmd.CHILD */);
+        var ch = gui.GetWindow(parent, 5 /* GetWindowCmd.CHILD */);
         var n = 0;
         while (ch) {
             n++;
@@ -11,7 +11,7 @@ export function startDumpRects(rootHwnd, intervalMs = 3000) {
             var txt = String(gui.GetWindowText(ch) || '').slice(0, 16);
             console.log(indent + '[' + n + '] hwnd=' + String(ch) + ' txt="' + txt + '" wr=' + JSON.stringify(wr) + ' cr=' + JSON.stringify(cr));
             dumpChild(ch, indent + '  ');
-            ch = gui.GetWindow(ch, 2 /* gui.GetWindowCmd.NEXT */);
+            ch = gui.GetWindow(ch, 2 /* GetWindowCmd.NEXT */);
         }
         if (n === 0)
             console.log(indent + '(no children)');

package/lib/dumpRects.ts

@@ -1,9 +1,10 @@
 import * as os from 'os'
 import * as gui from 'gui'
+import { GetWindowCmd } from '../constants'
 
 export function startDumpRects(rootHwnd: gui.HWND, intervalMs: number = 3000): void {
   function dumpChild(parent: gui.HWND, indent: string): void {
-    var ch = gui.GetWindow(parent, gui.GetWindowCmd.CHILD)
+    var ch = gui.GetWindow(parent, GetWindowCmd.CHILD)
     var n = 0
     while (ch) {
       n++
@@ -12,7 +13,7 @@ export function startDumpRects(rootHwnd: gui.HWND, intervalMs: number = 3000): v
       var txt = String(gui.GetWindowText(ch) || '').slice(0, 16)
       console.log(indent + '[' + n + '] hwnd=' + String(ch) + ' txt="' + txt + '" wr=' + JSON.stringify(wr) + ' cr=' + JSON.stringify(cr))
       dumpChild(ch, indent + '  ')
-      ch = gui.GetWindow(ch, gui.GetWindowCmd.NEXT)
+      ch = gui.GetWindow(ch, GetWindowCmd.NEXT)
     }
     if (n === 0) console.log(indent + '(no children)')
   }