From 39e3dacddbf0728f0e42bd367e7fb75aa4888755 Mon Sep 17 00:00:00 2001
From: Crimson <aarbbs@88.com>
Date: Fri, 30 Aug 2024 00:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 default.aproj           |   1 +
 dist/视频添加二维码.exe | Bin 2055680 -> 2076160 bytes
 dlg/qrcode.aardio       |  10 +-
 dlg/test.aardio         | 200 +++-------------------------------------
 main.aardio             |  23 +++++
 5 files changed, 43 insertions(+), 191 deletions(-)

diff --git a/default.aproj b/default.aproj
index 2f64945..4b360b9 100644
--- a/default.aproj
+++ b/default.aproj
@@ -5,5 +5,6 @@
 	<folder name="窗体文件" path="dlg" comment="目录" embed="true" local="false" ignored="false">
 		<file name="qrcode.aardio" path="dlg\qrcode.aardio" comment="dlg\qr_code.aardio"/>
 		<file name="test.aardio" path="dlg\test.aardio" comment="dlg\test.aardio"/>
+		<file name="test2.aardio" path="dlg\test2.aardio" comment="dlg\test2.aardio"/>
 	</folder>
 </project>
diff --git a/dist/视频添加二维码.exe b/dist/视频添加二维码.exe
index 55aba2b575cf7c2bc32618e146b21ce1dc6a403f..9b4cc1de397660aa2a68f6485d9114ab84659ef9 100644
GIT binary patch
delta 20733
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
VJ#DW;gO%0SS1n$gjQsyj|6fa@H#z_S

delta 9560
zcmbVS3v^V~x&F_YGvtJsNzP1WCX)wDNB~g*LkWmH^vonG3Sy>!B2pznAQ4E$BnbGL
zGXvrM2!h#It;R>IMa0~K4XxTv9!RhjNw2F=bzQN7rk1w3Evro}wfEa+GC3y^tG!w4
zKi}T}-ur*-{qN^Q``{7n^@p2B2*U6^`NCB~)1Ge&Q!PES+<Tr8ui4WnG!I3ZsMJO@
zdwopY6cYsyM+-;-SwTZUDIgh?3L4rH6Ky-wBa}g!N~8_XA+1*=%|b*z3u$S<3ZMc6
zQ}Y4$0Rj4-gztQijP}jo=K(u`g}^hwn}NN+c|b)XZ5eP3@DZR2d=$7qqKMXvL>P<?
z;AY@yU=#2>@CZ<JlXep519k)RfMg}@3ZM@d1Qr5s1I`3i0T%;fz_q}qfDORIz!!nP
z0>*)#08d*Zq`5t$^?)%NC=Vg+24EiWUf>kqPGBi;AFu-WBcKL+6Sxof9<UksS70Yl
z_M!)X*}z`lXrPip+GOAu;2fX|TnbzeLE;f4!oYpN&A?`06YvD^2=F}cBv8&o4**94
zNrph64>%842-JWxflmS#1Ahcu3w#UM0PF_72>cuv2M+a-7CDVX9uhsksX#fEw7Y<L
zz&hX*;6uPt;7(u#uo0*Me*oME{4uZ@*a_?eegHfJJP+&zehyTIBF3`N1Hj2Z6*w;o
z<G%oj2fzpen}C~vZNMhr1>g~&Hyb?wRDs>VWk9l_=YT%ocY%e#4&Y4SZ-I+}=Yea1
zGJ?ASs7Ee75=aD%&cXP<h=SRu5Fb<lu}uOhod%y*?g8@IA=^pg0`h=X;1u8xU@0&K
zSOJuQ8W5oW@%jX5F?{!#`Rpein@w!Cvx6R+SL#F&Q@u8i#ZJV|cx-O5$Ihy}woHp7
z$xs~ZsR4{a2Rku<QR-k{3}A#EY<#9khSUIQEfC+6!Zg24V($*K<wn9QY_vb0=xoAR
z%H3(B{AZ24T4<+#s78MJeRk?CHS$GmcB&s?<X`{TP7_m&e9w71-C1JfXHRg@%R~F~
z5xO|dL7!gU&!DsA4zk0Tq(MEEXn=JnnQw|YsNR$x^90&s1d`>-a}Ht+M*hW#Y2?HR
zCd*%+oJRZSB=ZrBTzwiHawQo=x%<-SM;M7@gOksv(e+*<?|UtcUV6sJcPvV$lr={F
z?f*`v!zOv!C+YO_F-EzXu25@6Ump5NDp2TKql^kuW-9auVkv3Bky3?<O&(vYQ0Nt`
z(8=-x>l7*|GV&*1R%n5#N5`B}sM+XpI{lGC&$C2*uAd%S=cKI53<3L^ob(q=f~11&
z&pIh{ijjZ*JtsYWjgeQ~F1pNQK*dZK-RC#TKUnUfktTy_t&1A+^m1K4HSBZI?@e9y
z&`T~_VG7FbU%JR<QgA`Ypc$qiDe`5|g1Zfc+t*~!t0sd>u-)AEnNfb^yKbu2hd801
z)EC@Tjm<CVar3KgDy}l}7YaOd!en5_WDm8N@(<nQp@XI_9y`xNKQ#qi_w63)H3jLJ
zyFK*RY{-xFO}o<%c&NY>bQd>zDAm+uGV@T-<nip6vG14!zJ1t3#n&4KE1!Gli60vI
z1J8M>$YbQs9P!ex(LR#&_(<G4pi6sy?WKjLpqzKnOS7=>CF?f{nKXL3(4X&|;iI=r
zW4`x0KH7o<O0s@ljgM~0G4kOZKJw*Kq`$)EANpuku2JFLqdvN}(#X57%A$EcH}VyK
z%%VMtVZg;NvT6AJMtSb)94ax*qQwvAP{SglyyrJLwB`zof6~GVDVG*viA?4@oVhf2
zypi{*xzxB>>@RQb98NnjjdJzOaC*ViW8GFiIZOuhI{Xwg^}zJY{nQ;14FMy^`e}@5
z+RYy4rx#5@d0`szCV@|u_^HA)B+|_&HyLoC8hKL;&C^idw6eaw!B4~YV*V#RF0J>I
zWD3H0yIWkNZHKMwgDY(}v;@c69uU}j<7{KBb7>|8Hr0-|f$Sg$C=HYjQb5j@+VQS~
zxkI->xM-ntn$E7A<r*f~*-f)tUDmOrk&|6D+w}#kClm^|y8a|=V?wFR%g&EZlOvT&
zu?^#I8VFHJ<@c9Y)fp_l@rKLlDoEx6c%@X(lGU|!)vInN8E4`_%$X#kBXuTkQMqb4
z$(X)6g9`%#?XV~(IJ_=cXoU!-Y3x9$Ynyckk}tPR54oNbt=J&xK+D;=u3EwR0@5$B
zMe|+V?Blp^EUWsL(=EKjCREwH?984_i9LOrE0@(evvXO*nXM!~?`(1AvZi<J3cK*C
zQxOiZ|JrZ&vZidi#OB=Ys$?Y-d<rX_;2X*A>`J#Y?Sx%sV?NEYvnNM5>?}UPCkv0U
zt`qixMlNH<Kb?6juf=6&dlqE4+0zR$<iVd?3eh;8qDbuQ!VDklS(qWQ#q~a^<>Lje
zjS`biK+HRvoicOxIC9y&DVcff-FqAv?BsV`yO{ihlHO8%m+Q_#A)EbTr>nr<9n=U5
zv=$EvBw0u(v1sB*Eg<G=q-pH}8@0=IxgfJ!cez3ygg8G{@lzE3+$#TOv$785G8XPo
zeElDV-O}L7WLlF=zIj>Y%JRf`XQ4I^fpA$(*(!s@*Ujp%k>{gWTT#8n;P8Q7T3N$R
zj>>Ygi<f)lmR~iv##`8?zd4jm>3dzE43N7eeXpnYvz8Bcc;hoSt@zLj$^`j9SuHC*
z%#J_E?!L-4v}M?u9JZ)M{d3OpD>hwOm<t*P8s2hcq5nC-G6Z3=dz#zL{xroeM{soP
zQUkHBcwl{(8r;wo57u|7#T&cg#hXBzyR?qYUGerUNN>GY(*&j-B~JiXtAK?<(WBc!
zfg84ic7$4QSRWE@+z^T$+X>ngYAtR6f^OUm1l{;3@KI+#*tTEQgiUbyP0)ObrqX^0
zPBN%9k*}wr)JB>>fuU4~rAER`+^>>&SWTou8a>A1Z*iVbui@}Xvjm>zGj<%?wbMJC
ziSxbLY|li0F?-{FC6fh9d_Fe$eq|iHwKpf5xr+Sv4&_sK$;!%ba0Oeby2i6V7x||;
z_zYcBwKQB)y@X_TaFTzRLk|qFvE)z&J3Yz2MR2f>uFTC~;VlZH_2V2LYr4lFu?@E&
z5}POc=O(sm>|-<vBv^4Bz`=-01QOsBjntxIew?)RNV9-y*&iSwU$bahG+8EU^{qr(
zgn)$w0u~D_*dNt|Q_+A$Z4>A)@;ppG3y^q92wH%;>)dudeA%yWaphRXXezsJakh_r
z(U>F8ktH5!WlOPSN!;^u^@o1PUPeZb+UoFXL@Dgi|FA*Q2#_F>m3YY3gP5uc7Su?M
zs^WfjGMeR0<xQ8YtgbC*6O<eeE3!L$Y+<=8gQ>5%CHCs)K6jelpOsb1s%uu^?#`Zh
zTFGFGyjV5<P?~0EAMW?s8=KIHYPn5va+REhgYr2sWl5TcojGN<HvSz;LeC_pm2I8l
zT67i6Ana-SdK#_{uPU!vO)~ZnoyiLasGY_}jId|0mlwK5vj3@qHhg6E&h%WFeeidO
z!qhb$SYZChg2X<Y<11jp?|0cfe8J_!1Aq^xPHgDvv>etrEGxr16}$lo`I<eIeQ}o~
zi?vMgkFccDeAYF=KQ^KY)TOn?x~Oe^m)5qSi`whEwDyhq<chbGrxlZ;RiKd2u{jj&
zh=qisTQJeKhFXteg1w0e_U3j>qRstvgk!N#;27#0L!D!&)43rO=tQ09j`^)3CTZv9
zP;2LwkZ^o!C~$mzBosZqAtb!D=dmc!?$(<h+Z~wM7>Y*shN8b{3<+<ukkGyl#Fgwe
z&s2)q^@*y*?F1W16f{v29CSR|Nkxc8K0zhK3lKyWkchO{CB(jaT<D;ppk8M@bqV4V
z$6Mc|qFAC4&!1}jB@bocC?uZ}PV|TKHTq1}gKSmxY6RK8=6Q$lIej_1;~&oKEIu4d
zs#k@pYb)!@5!QVxch7a~^NIfa%XpCAv%0RXx(Y$gV}HrYTBP`<d9Gpi*&|y&+17Y&
z>x(Q}=*ftj#Jdl#Q^yzUgdnv{O(f*{zQmad6`Kgr1Ia2xs>BCAq2^m=>Dv<0lQmCk
zNg1p95=v5PyhgPo77UVAiO;t1%GIzmp}Z;FS6}^3Un1|}zQoB|l^=uXp0Xt?me*9T
zuHsXB78u1-7tOCNuc=*h&DGajJ!w%%dF=}LwW#}rjlX+#_qk`EI=8jy>`%9U`r6@7
zo1%**++F#t+RPRAEL&AlJF{%v%!>O;m#wLr91e^RS1o5Fp7gnyR^-o(=!-^Tx#SCl
zt{Jns{M+T>@-iHH^p2>lt0}Krf&-6UyQ;dba@o4Rq9xT;wbgvLO!$QjRzl!l$JHD5
zFS!yw6;)SZTvwIp4)yJrEUnn(iS)H4zO)_!4Y5)hy)O`554t@N7dr$J?`_qD0!<b2
z)#=#diH^6%EvJN5%V$v%_)@CI1lk~KVjN2;#?w+Ju9uv_Sj;Mllo<?4TVidN<85u0
zR7<<%rs8(X6+yD3f>$g?H1Y*SX_P8R`Eje3Dz<~EQ5NS>45tc7OGU%cm<0K8i=O7?
zdK;WD^D$|XO0<}Tt_W&^fbukv1Zoq3nlJ|r?8NNKr%ElM)TA@=RZ4><L%4Dk%E22w
zSZUiJr9sO;rSURd>1ghtI%J>$a4?cj@ERWWdzJLmY`|cpSP2Gr8XM%Pws2ria^-!F
zj^@2;=!_(~@|!3P4pNHq{ebRO=Ng`JW%~Fghw7__GCBT(J&X-f)+P;9rp^AchiW2z
zbPvC2+(ZzanrI!^ok7e2bKu0U|9a2N!^L~^tKua#P*;T71}UTKzU*0ihR#cj9nyo9
z#itp;Nz;rOAr2Yj*pPvasZ%0afp&wCPm}n(7Cyz?&Znz+TKr9GRJ34DXNe*YPN5*)
zCh_T5jQOs$4WSN^q-WYhYbX|rEukAxHc>CTsVy#TX={`AiF#Q*udnlh$E3#-yq)@V
z)Cy5Q0>Ns#-d(!jSjv|L(|AKLg!Bnc2vNtP3^Fvcaa@LGF^oHA$&X)d$cVwXHUWl<
z^~L-eu3IN|N{=U)4Sd1KkB?3WCX;bN`OAXUk%nN%=o6ffq2(uJ#5>@itk=_G2^rKb
zQ;CJ7$TLBU-h~AOD^=3;t|Y%9)NJh~jP38<uj%ssRZz`J7^NPS@+l>fuu4qTJxf}3
zNu%N(!zh!d|G5FqgaL7GKqMt$K=7Lw;4lpMroCc{7o!JK69%YnO8F5jIWFJC0IOlZ
zrF!5}%CJEd#Bah36O9?B3L1{2bOJNZ8yAKmp$U9j?FzgV;}@<gh?O08xY;k$a_z3f
z1})<>#rJJ~ka?`k>j}tuwyu0FKPd1MSV>LU^5vCP%cth8odFiFJT`9~PxA9r|5-sV
zSh{*un1x1VX0kJ<)3PEG9wh198+*=e+3{)YC+9Z3cJ`+mahmJ?*-t)sW+Mb#vUuCS
zD?ZoqgMVAR>yW7!N3}u9(VXjl;ZZ2Z<0?Nxj$2v2jJtXXTh8q|)L)yQb$IQX%H<Vb
zRh<jpmJp6tKOFX|aim@Kbqe}g@UFfm(V$O9-w6r>#P3hZVaS6OQ}dRVudFM(V+LD%
ze`Z#Mo8DiXkkMZQp6U15zCq06-u4wP;A6<|g=;F8@|Q1(KaBLt(Ty<I#7nACn(R1U
zAp%o$S-g+NCQXC9VS`(INhZI&_G|3(ez1jkm#8y9&^Y*!=qm+%g{6$2RQV0FUvhcX
zQhw{;CGWF<#h<~1g?ME6`F?LMyY@z3F6({@Ph!eCR}s?=;$3X9+a<H>{(z5CjQ2D3
zkJ(acJ{of>VAF<WO=N}Za1qr%VcF$lf3l%j+7z42W~Je>Jn4&^Tvj^8j~BPT4;~-h
z_eiYt9SH6DvDeNXlI(KoL<q#M5HyK>RO$A!o=UgU_whn#VX8}F%|&R|J=1PycV3U@
zxU<jUX58}}O4UbUTKI?Q5^GW%uo>CLxoJ>wtwVAIA(T@wsDw3Kk5{lWzsr{Xzn{V?
z{JPiF3;pq4?ts+~J@2}tRDOq<4Z4Lzw|fg%!*;Kmf9x#sLb}2Vhxlc-{lPSQ<3Hia
zzO`=n^iS7VcDKr}@^|@Q|My|>_V1(1dOG0A$aXv$o^c_&_-3^D`yZVU;_%4qXWvGP
zLkIE1sjTq$*u@bprSZ2}64Q3!^+KzGb?U8nqMS3=AwTwt-_A-`cx0iPMej(<WDoxZ
zQXagGKac)43;nwS9oozruYTX9u;zpK#4};W!A^|fFK%<XnIhl`<J}<{s5~SimtD2j
zp){7mS}g^B-?|s?rMCHa6>UiIyV?2AJZ|e|bio!ToWRpX_1nYUZ1L}5GhSTv$JVjJ
z9`?TyUbe;^#;_IrHG5>E4XyFS3g>JYlJ!Zn{vK1E*_Sc(XFj>H6s{j{!4vN*ai7on
zeU$!yUHhyrlU>>Bv$F>m;Cc5D6UyCQ_j_2}`GQ=5OIaem-xFBb?U@-7Ucv)@O{ww9
zndGe;#N(4^E#?e>SK(QH73|A$`8DNBu;}p>^KT$7S6_e@ko+&CvELZHJ8<O`@GA^w
z@}>h`Tl8hIx@Kv4&FzUbhhK^-Ym*Z-p<*f4s(I_exPNj*wRL4Rbx_owh61qZ$Dku1
z!2&gW6>A3_r?`+BhzsiEC{b2G5W6U<@tu$R)W6TcH!Jd3!;%XJ^;`!ArLd+ydvaLL
zNpB|08|jqv-_nx59B^m29@8%eoCP-r`iMNe26_W@Y2#p<?;F|1y9<9w;{q2vIl>!>
zhkb6|BtAs{sd@AH3tJ{rA9UN<n5+FGS?SgOu`KTuue<Smugr-(H3pA^YC2zI(p}0Z
z-dB7S`B)_>9cjMAIzjvi&BH$Wo->p6d=Kya%1OKANDdDlq9g1ruRVvoe!-*YKLJGM
zfjJ;9xERj-Qhe}VVtB#eIGNtZ?~e*Z$c(`}L`ss!L$^P!(&cOWssgAq(DK1lfA5{_
v@Kfn-E8i@$*dH4GSEq8n`Jc6A9P?+0!X*5oRB_9O$NguM=>t#tFDU;9<6|Ai

diff --git a/dlg/qrcode.aardio b/dlg/qrcode.aardio
index 8c7be11..6c6160d 100644
--- a/dlg/qrcode.aardio
+++ b/dlg/qrcode.aardio
@@ -3,7 +3,7 @@ import win.region.hole;
 /*DSG{{*/
 var winform = win.form(text="aardio form";right=304;bottom=297;border="none";exmode="none";mode="popup")
 winform.add(
-plus={cls="plus";left=0;top=0;right=305;bottom=298;ah=1;aw=1;clipBk=false;db=1;dl=1;dr=1;dt=1;transparent=1;z=1}
+plus={cls="plus";left=0;top=0;right=305;bottom=298;ah=1;aw=1;border={color=-65536;width=2};clipBk=false;db=1;dl=1;dr=1;dt=1;transparent=1;z=1}
 )
 /*}}*/
 
@@ -19,13 +19,14 @@ subscribe("getQrcode",function(...){
 	winform.plus.background = qrcodePath;
 } )
 
+/*
 winform.wndproc = function(hwnd, message, wParam, lParam) {
     select(message) {
-        case 0x201/*_WM_LBUTTONDOWN*/{
+        case 0x201{//_WM_LBUTTONDOWN
         //点击左键移动窗体
-            winform.hitCaption()
+            //winform.hitCaption()
         }
-        case 0x205/*_WM_RBUTTONUP*/{
+        case 0x205{//_WM_RBUTTONUP
         //右键菜单
             var popmenu = win.ui.popmenu(winform);
             popmenu.add('关闭',
@@ -36,6 +37,7 @@ winform.wndproc = function(hwnd, message, wParam, lParam) {
         }    
     }
 }
+*/
 
 import win.ui.layered;
 win.ui.layered(winform);
diff --git a/dlg/test.aardio b/dlg/test.aardio
index 1c2ddab..805d80a 100644
--- a/dlg/test.aardio
+++ b/dlg/test.aardio
@@ -1,193 +1,19 @@
 import win.ui;
-import mouse;
-/*DSG{{*/
-var winform = win.form(text="aardio form";right=759;bottom=469;composited=1;mode="popup")
-winform.add(
-button={cls="button";text="向上拖动";left=538;top=138;right=673;bottom=199;z=2};
-button2={cls="button";text="向下拖动";left=539;top=239;right=674;bottom=300;z=3};
-plus={cls="plus";left=266;top=117;right=466;bottom=317;background="C:\Users\97975\Desktop\视频增加二维码\1_i2skbfmDsHayHhqPfwt6pA.png";border={color=-65536;width=3};clipBk=false;foreRepeat="stretch";foreground="C:\Users\97975\Desktop\视频增加二维码\1_i2skbfmDsHayHhqPfwt6pA.png";notify=1;z=1}
-)
-/*}}*/
 
-import console;
+// 创建父窗口
+var mainForm = win.form(text="父窗口");
 
-// 定义边框宽度
-var borderWidth = 5;
-var isDragging = false;
-var startX, startY;
-var dragType = ""; // 记录拖动的类型："top", "bottom", "left", "right", "top-left", "top-right", "bottom-left", "bottom-right"
+// 创建子窗口
+var childForm = mainForm.loadForm("\dlg\test2.aardio");
 
-// 重写plus控件的窗口过程函数
-winform.plus.wndproc = function(hwnd, message, wParam, lParam){
-    var x, y = win.getMessagePos(lParam);
-    
-    if (message == 0x201) { // WM_LBUTTONDOWN
-        // 获取plus控件的位置和大小
-        var rect = winform.plus.getClientRect();
-        winform.text = "Dragging: x=" + x + ", y=" + y;
-        console.dump(rect.left, rect.top, rect.right, rect.bottom);
-        
-        // 上边框
-        if (x > rect.left + borderWidth && x < rect.right - borderWidth && y >= rect.top && y < rect.top + borderWidth) {
-            console.dump("当前点击了上边框");
-            isDragging = true;
-            dragType = "top";
-            startX = x;
-            startY = y;
-        }
-        // 下边框
-        else if (x > rect.left + borderWidth && x < rect.right - borderWidth && y > rect.bottom - borderWidth && y <= rect.bottom) {
-            console.dump("当前点击了下边框");
-            isDragging = true;
-            dragType = "bottom";
-            startX = x;
-            startY = y;
-        }
-        // 左边框
-        else if (x >= rect.left && x < rect.left + borderWidth && y > rect.top + borderWidth && y < rect.bottom - borderWidth) {
-            console.dump("当前点击了左边框");
-            isDragging = true;
-            dragType = "left";
-            startX = x;
-            startY = y;
-        }
-        // 右边框
-        else if (x > rect.right - borderWidth && x <= rect.right && y > rect.top + borderWidth && y < rect.bottom - borderWidth) {
-            console.dump("当前点击了右边框");
-            isDragging = true;
-            dragType = "right";
-            startX = x;
-            startY = y;
-        }
-        // 左上角
-        else if (x >= rect.left && x < rect.left + borderWidth && y >= rect.top && y < rect.top + borderWidth) {
-            console.dump("当前点击了左上角");
-            isDragging = true;
-            dragType = "top-left";
-            startX = x;
-            startY = y;
-        }
-        // 右上角
-        else if (x > rect.right - borderWidth && x <= rect.right && y >= rect.top && y < rect.top + borderWidth) {
-            console.dump("当前点击了右上角");
-            isDragging = true;
-            dragType = "top-right";
-            startX = x;
-            startY = y;
-        }
-        // 左下角
-        else if (x >= rect.left && x < rect.left + borderWidth && y > rect.bottom - borderWidth && y <= rect.bottom) {
-            console.dump("当前点击了左下角");
-            isDragging = true;
-            dragType = "bottom-left";
-            startX = x;
-            startY = y;
-        }
-        // 右下角
-        else if (x > rect.right - borderWidth && x <= rect.right && y > rect.bottom - borderWidth && y <= rect.bottom) {
-            console.dump("当前点击了右下角");
-            isDragging = true;
-            dragType = "bottom-right";
-            startX = x;
-            startY = y;
-        }
-    } else if (message == 0x200) { // WM_MOUSEMOVE
-        if (isDragging) {
-            var deltaX = x - startX;
-            var deltaY = y - startY;
-            if (dragType == "top") {
-                winform.text = "Dragging top: deltaY=" + deltaY;
-                // 处理上边框拖动
-                if (deltaY != 0) {
-                    winform.plus.top += deltaY;
-                    winform.plus.height -= deltaY;
-                    startY = y;
-                }
-            } else if (dragType == "bottom") {
-                winform.text = "Dragging bottom: deltaY=" + deltaY;
-                // 处理下边框拖动
-                if (deltaY != 0) {
-                    winform.plus.height += deltaY;
-                    startY = y;
-                }
-            } else if (dragType == "left") {
-                winform.text = "Dragging left: deltaX=" + deltaX;
-                // 处理左边框拖动
-                if (deltaX != 0) {
-                    winform.plus.left += deltaX;
-                    winform.plus.width -= deltaX;
-                    startX = x;
-                }
-            } else if (dragType == "right") {
-                winform.text = "Dragging right: deltaX=" + deltaX;
-                // 处理右边框拖动
-                if (deltaX != 0) {
-                    winform.plus.width += deltaX;
-                    startX = x;
-                }
-            } else if (dragType == "top-left") {
-                winform.text = "Dragging top-left: deltaX=" + deltaX + ", deltaY=" + deltaY;
-                // 处理左上角拖动
-                if (deltaX != 0 || deltaY != 0) {
-                    winform.plus.left += deltaX;
-                    winform.plus.width -= deltaX;
-                    winform.plus.top += deltaY;
-                    winform.plus.height -= deltaY;
-                    startX = x;
-                    startY = y;
-                }
-            } else if (dragType == "top-right") {
-                winform.text = "Dragging top-right: deltaX=" + deltaX + ", deltaY=" + deltaY;
-                // 处理右上角拖动
-                if (deltaX != 0 || deltaY != 0) {
-                    winform.plus.width += deltaX;
-                    winform.plus.top += deltaY;
-                    winform.plus.height -= deltaY;
-                    startX = x;
-                    startY = y;
-                }
-            } else if (dragType == "bottom-left") {
-                winform.text = "Dragging bottom-left: deltaX=" + deltaX + ", deltaY=" + deltaY;
-                // 处理左下角拖动
-                if (deltaX != 0 || deltaY != 0) {
-                    winform.plus.left += deltaX;
-                    winform.plus.width -= deltaX;
-                    winform.plus.height += deltaY;
-                    startX = x;
-                    startY = y;
-                }
-            } else if (dragType == "bottom-right") {
-                winform.text = "Dragging bottom-right: deltaX=" + deltaX + ", deltaY=" + deltaY;
-                // 处理右下角拖动
-                if (deltaX != 0 || deltaY != 0) {
-                    winform.plus.width += deltaX;
-                    winform.plus.height += deltaY;
-                    startX = x;
-                    startY = y;
-                }
-            }
-        }
-    } else if (message == 0x202) { // WM_LBUTTONUP
-        if (isDragging) {
-            isDragging = false;
-            dragType = "";
-            winform.text = "Dragging ended";
-        }
-    }
-    
-    // 无返回值则继续调用默认回调函数
-}
 
-// 向上拖动，图片增高，上横线上移动
-winform.button.oncommand = function(id, event){
-    winform.plus.top -= 1;
-}
+// 设置子窗口的父窗口为 mainForm
+win.setParent(childForm.hwnd, mainForm.hwnd);
 
-// 向下拖动，图片变矮，上横线下移动
-winform.button2.oncommand = function(id, event){
-    winform.plus.top += 1;
-}
-winform.transparent(0)	
-winform.plus.orphanWindow();
-winform.show();
-win.loopMessage();
\ No newline at end of file
+
+// 显示父窗口和子窗口
+mainForm.show();
+childForm.show();
+childForm.setPos(0,0);
+// 启动消息循环
+win.loopMessage();
diff --git a/main.aardio b/main.aardio
index 44382e1..c04312b 100644
--- a/main.aardio
+++ b/main.aardio
@@ -135,6 +135,29 @@ mainForm.plus2.oncommand = function(id,event){
 		frmChild = mainForm.loadForm("\dlg\qrcode.aardio");
 		publish("getQrcode", path, imgW, imgH);
 		frmChild.show();
+		frmChild.wndproc = function(hwnd,message,wParam,lParam){
+        	import mouse
+    		select(message) {
+        		case 0x201/*_WM_LBUTTONDOWN*/{
+        			//点击左键移动窗体
+            		frmChild.hitCaption()
+        		}
+        		case 0x46/*_WM_WINDOWPOSCHANGING*/{
+        		    // 窗口位置即将改变时
+        			//var x,y = win.getMessagePos(lParam);
+        			//x, y = mouse.getPos();
+        			//mainForm.text = x ++ "," ++ y;
+        		}
+        		case 0x47/*_WM_WINDOWPOSCHANGED*/{
+        		    // 窗口位置已经改变时
+        			//x, y = mouse.getPos();
+        			//mainForm.text = x ++ "---" ++ y;
+        		}
+        		case 0x232/*_WM_EXITSIZEMOVE*/{
+        			// 用户停止拖动窗口或调整窗口大小时
+        		}
+    		}
+		}
     }
 }