From 9298dd089c80609cbe7f58fc648a17f38576b717 Mon Sep 17 00:00:00 2001 From: eccles Date: Sun, 4 Jan 2004 18:14:18 +0000 Subject: [PATCH] Focus is now set when control initialisation is complete (e.g. after Link control HWNDPROC has been changed) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3353 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 22 +++++++++++--------- Plugins/InstallOptions.dll | Bin 12288 -> 12288 bytes 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 32f712e7..ec8509ef 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -1099,21 +1099,11 @@ int WINAPI createCfgDlg() if (hwCtrl) { // Sets the font of IO window to be the same as the main window mySendMessage(hwCtrl, WM_SETFONT, (WPARAM)hFont, TRUE); - // Set initial focus to the first appropriate field - if (!fFocused && (dwStyle & (WS_TABSTOP | WS_DISABLED)) == WS_TABSTOP) { - fFocused = TRUE; - mySetFocus(hwCtrl); - } // make sure we created the window, then set additional attributes switch (pField->nType) { case FIELD_TEXT: case FIELD_FILEREQUEST: case FIELD_DIRREQUEST: - // If multiline-readonly then hold the text back until after the - // initial focus has been set. This is so the text is not initially - // selected - useful for License Page look-a-likes. - if ((pField->nFlags & (FLAG_MULTILINE | FLAG_READONLY)) == (FLAG_MULTILINE | FLAG_READONLY)) - mySetWindowText(hwCtrl, pField->pszState); mySendMessage(hwCtrl, EM_LIMITTEXT, (WPARAM)pField->nMaxLength, (LPARAM)0); break; @@ -1224,6 +1214,18 @@ int WINAPI createCfgDlg() break; #endif } + + // Set initial focus to the first appropriate field + if (!fFocused && (dwStyle & (WS_TABSTOP | WS_DISABLED)) == WS_TABSTOP) { + fFocused = TRUE; + mySetFocus(hwCtrl); + } + + // If multiline-readonly then hold the text back until after the + // initial focus has been set. This is so the text is not initially + // selected - useful for License Page look-a-likes. + if ((pField->nFlags & (FLAG_MULTILINE | FLAG_READONLY)) == (FLAG_MULTILINE | FLAG_READONLY)) + mySetWindowText(hwCtrl, pField->pszState); } } diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index 7555d80609300042d44debc9fc7fb01aaee88578..fe9dea353f118cfcd465f3a8d768a81135b37bd6 100644 GIT binary patch delta 1803 zcmYLKe@s(X6uu7%QmM8Wu&7`F5##D6_P+Nh12PtQKo*NN4X__U-DZ^4Y|gE((@1Se zTlM+CNgle8VIq@dFg0NV5hErjI51-Y2U8L-Lqpl2XS$$?0O8V-Rwt6T3c1tKGgtblx7nyl^%jS$oObAWp-NbhF>sF!9533TcG8-Nh5 zA2MWaBpn$_$-S)DZb=Bz8f_3PZ=p4Gk%}YcM%f^VtA!-cJQ31dAAwM{&}buKki?ya z2oOh@t<+B9J_aURTV&yq$=YNBckB*GYm$U<$=XH4MmyoC28pYJL;*0Z^i+&a^(yFp3lAaNQ9 zWF`(m1*xoGDjU|H(rFNq%ElV{=&aVUYL=1nV|_tJUv)1Wb}G1BfBdI#56q+S-W(6} z<@7)vaxRxU@?M7p-fi$ZsgpZ$L#&YgCT@cw4h<1IBw>cQ;>nOhBMB40i7N?6lq5_M zv4^-47Ks`nsbt7^G#*L9v^!E3#u;G(-^naWS|lD}Dzhko;x0x|GmBFHh0~eKXg|(a zxp-U_rcA{XQt=dE)1Xv50dvS}eO(K_p!PElNeu+nL38=6Z#)SHCqDwzlJYsCsgR4h!e2yL>#dbHjoXQOT-xx=clJT5*U?sTJ-+pFoZ()#F1`SlosnwUkKtb20^4su|o}7iCoUid(w&(*F06RdZ{7)LG zpphb7;EvvZ5}+@*R5bPqom&C-3NvqpOt1*dWE{A?i|(%$-NzW@K|9o|PYHo%1ry0Z zrwNcV&HGw~xW>ByWd&V28}uP|+SM^gD}aFWx!emDiN6rBPj!G7I-?IU8dUc_%V(pa zoUTgu3@svl=pYVM9sp=pzoe;0HF7U3*83ko_b2tG-nohsRw9N&F{+87VzSLa%IRvm z`T;EQ1&MRH4dz``DFK()O^`G4|7I*myz-T0C~O`*%Vn zW6JNXfj#{j9<~aHBIW1$-2F&QkcE-;aOzPx^ytN9_FjRW1X62ZkzB-f7=W$o%jy%g z#HF#T3b=_d>=VWcWnnlgg1%3E)%*+SlgdRCt`4D*1~zd>%8VxZ}M{zp@Zt_;UMi|H-Ns zL+}zUc0L4KC_EE_Z4{nVK3$cPypK9u8g*C5>eSMZHK^M|HcBl}+E~^@MfHWx8g#)9q+?V9KaH;#x?j1uEXbW1O6H}_H}Fk7 zgh#Q8pW+1^&gxhro55zYW$gRxe%8qzVUMvjY#rOce#2g7ud_d}_gQr}`;47uBe)oD zEtke^;>_HuTp?%U-r@Fg2e}IF821G?#699Bxmj+Wi{O{?G5kh;GjHKv=ilIW@FIVN l_w&{KS^gZ~%y;s)_#gRUew2UAKj*a>`V4dH=dT=O{sDRq-N*m{ delta 1810 zcmXw4eN0nV6u%Fuw1Tv56cAx4U&gKKu=l+utU~bPbtIFfhCyAjZp1`JI$dV$tGWq& z+E#o#VCplQn#K6F4Huk5jIxbws3`>aJ|krKa`ILa4TD1u|5MHd-lsPDq7Q z`FECFu3JO>D!1#hskV;abkh=i`w&7ERZgk6=>ufIx5c_n>r*jnNewcHSsqaFh6+WS z0Kq~WGTf`4j?m%FptfGn2g-m*NJS-p{M{Psg`>y7rVlIxE)*htARmCzHcm*eTOUXV zLYO}AkeF}*GC0XiYsv+Yi>f)k0%L8vn&a6t**)tg*8nl@1t*BPGZr&-8bZxntAp@S zV%!B5AnrJavw|2u1}2rCmbi9vd7By3DXYM(P2`5e@@~SnRuD#wL5xk{=%xriAO~K` z@eN30Rm5meLj`LIAr4?kYN!|!xt?b3ki$*aZicGBq*YDaA$P|9cP1WJmF_p6zZMm_ zE@ISxp(v{#GKj8z(G}LWJc~z2boCt$sb?+kYo;m5mg0|6`lep6_@l}ChM(hoa2}0t zZaB_g+yj2dlPv99u@p84E8#biB<(AWu`>0ycqJrpYY5*Za%04sPHwq1A~y`2cuhdG zBBv0(hj=rm$Y_k@kz4-ybR=^3>!wTG5XBAS%SCq66!CFNkv&tz-4r)kWY2p6?-$Kf z>+z&Wl|vGzm@9|HN(HdFU#uL4b4Vrr?&tofZqr7R7xd;raW>jNY{KEl8bGb3o_PNi zQ=ofGyl~Yt-lOq=G_)F2p_S@2<2{t;4gZxD$B{42fcSXfj?bw$V8F(0w84{&NhAxR zfMY%?g(2z_&MCUO7Mg)ROl@yu|zDTpv1s8Bb7JkxDLiCW1e8WKa0Q^t+d|H4Skl##SK}F=I zbb-1p&zxPh;NoBZM^%1^!8SG5$rx-`;jtJzt-}5C_SrevURB}MC?CaSl2Q|s2Iak& z)GAf-#o1=+HTlu(52Uv$)R+|p_J#d5>)yXBE39w*~D*o5a{8W-VGyc(~?Ui=BJ$J_A^ z+=yH79{f2zfDhs$_-p(v{tlnQJ-81K;y>_1{11MHwe&oC0d1$>rr)L4((C9=^me+D z-b3%B57KS)Svo`yR?`aofF7sg7(J85WHGsnnJHqHGAkJ;vxZsEY+`mYJEmS^kP2DXJgz@A_`*e>=W+sB642>XOZi*q|ZTeyMx E56PC{)Bpeg