From ef06098372dc7668713a8a72da22ccf0dc42b023 Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 16 Feb 2011 23:57:32 +0100 Subject: [PATCH] Use an offset to draw the Clear button so that it can be better placed based on the inputbox right border For luminos skin use a copy of the Close button and set the proper offset (previously the image itself had the offset) Add Clear buttons to the other 2 skins (a copy of the Close button for Xaw and the middle part of a checkbox for Default skin, this one not very nice tbh) --- gfx/menu/default/clearbutton_c.tga | Bin 0 -> 4838 bytes gfx/menu/default/clearbutton_f.tga | Bin 0 -> 4820 bytes gfx/menu/default/clearbutton_n.tga | Bin 0 -> 4838 bytes gfx/menu/default/skinvalues.txt | 1 + gfx/menu/luminos/clearbutton_c.tga | Bin 28471 -> 30338 bytes gfx/menu/luminos/clearbutton_f.tga | Bin 29279 -> 31371 bytes gfx/menu/luminos/clearbutton_n.tga | Bin 28675 -> 30813 bytes gfx/menu/luminos/skinvalues.txt | 1 + gfx/menu/xaw/clearbutton_c.tga | Bin 0 -> 2232 bytes gfx/menu/xaw/clearbutton_f.tga | Bin 0 -> 16402 bytes gfx/menu/xaw/clearbutton_n.tga | Bin 0 -> 2612 bytes gfx/menu/xaw/skinvalues.txt | 1 + qcsrc/menu/item/inputbox.c | 14 ++++++++------ qcsrc/menu/skin-customizables.inc | 1 + 14 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 gfx/menu/default/clearbutton_c.tga create mode 100644 gfx/menu/default/clearbutton_f.tga create mode 100644 gfx/menu/default/clearbutton_n.tga create mode 100644 gfx/menu/xaw/clearbutton_c.tga create mode 100644 gfx/menu/xaw/clearbutton_f.tga create mode 100644 gfx/menu/xaw/clearbutton_n.tga diff --git a/gfx/menu/default/clearbutton_c.tga b/gfx/menu/default/clearbutton_c.tga new file mode 100644 index 0000000000000000000000000000000000000000..26bc0effefe5ed84d28d8be8ebc1d980a0c9196a GIT binary patch literal 4838 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 literal 0 HcmV?d00001 diff --git a/gfx/menu/default/clearbutton_f.tga b/gfx/menu/default/clearbutton_f.tga new file mode 100644 index 0000000000000000000000000000000000000000..e857381452a9671f88afdff95ac3f5cb8bc0b41c GIT binary patch literal 4820 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 literal 0 HcmV?d00001 diff --git a/gfx/menu/default/skinvalues.txt b/gfx/menu/default/skinvalues.txt index b2b0a97008..4a1a934b93 100755 --- a/gfx/menu/default/skinvalues.txt +++ b/gfx/menu/default/skinvalues.txt @@ -183,6 +183,7 @@ COLOR_DIALOG_CVARS '1 0 0' COLOR_INPUTBOX_N '1 1 1' COLOR_INPUTBOX_F '1 1 1' MARGIN_INPUTBOX_CHARS 1 +OFFSET_CLEARBUTTON -0.5 // item: key grabber COLOR_KEYGRABBER_TITLES '1 1 1' diff --git a/gfx/menu/luminos/clearbutton_c.tga b/gfx/menu/luminos/clearbutton_c.tga index df5b64cb6c4d7b5baef40c74b4ec4b1dcde1a10f..3de1ccb804b6ac9d3d0bd182068da34481190389 100644 GIT binary patch delta 3146 zcmb7`e^69a6vy8Id@MiK-31=7%PuaEySOT>*{I1xj4_xpAZS>C5`|G3nEuf;x;mESALFL=K?<#$?e?w z9G$R1=9css?uI5fi$B0K@F~{C9EUR)AA1%)!J*ji;WYNdU4f7B;Jh2~5e5=c@v!_e zd?>6#@smJ=b=34HoFah)6TqMt7ui3_+pIQIG$+T0SxOL&g{<@- z^o6X9AoPm4Mjbx1+Rs2w*i!+nc67ko>PQgYQmqC&nUhRPo$VmM$uqQ%Ty!a_-A=}{ z-5|fg$J>e7?T572h0PP+Ches$`BDvy#ehdazuQE%=O|zmM4L|JlKr`*V0lf~NnA&U z^EQH|TOSmYk^F^CkRb+z-Xl>8oaRnQz_Sg~x*`_47_(t>P3OZBEnQ+eO9WLzptCeuk3r3`;45gN^e{D(r&oDY-Z3K|7PC}O=aarWb5-6xji0hcwgL z5x08M^+?nW6nGuAkpp)Z&&cyNvIC}VIM1QP`QehXIq@uqQWH%ft~DEH<+Yr%1I2SL z_$Tk#d`q64E1e%M-4YeQyln1#15HKPq>%o#Yhm$W{S0U72W^IfATbg7=ia)g1UOi3 zC%e`cMI|DGstAmVDS*$G>WRxhb!Gt9_i!3)dP&?^0a8a*~sux+uu($4d{;aHa6Q~sukJL{rNpnLI6zq%i#A?1; z^qu;36}Eix)Pr6q5G|zP$?3Ay zz7&bL!_&x{Invc^0?*5ll#v35SdJPfIq_&bWQs1_=%HNNa-7I9{;NuEj+A$&@1y&erov YCx08>Zt~qmTWl)s+}RBQv_FykKgEya0{{R3 delta 1370 zcmY+^drVDn902h1bGxThbgO&a?(I2Rt&);Ss8*@Sb@cZlYeeCz!`JHpVRYT-vFR|>@T;YUu zf#b%>RY}$cPyV8)X6rqF{=BFr>)?F8MbsGxBFX$&k*A@8nE57=4e*}qpsa`N2^T3( zg01QfTNzy*1<0IH_BsB!vCNIG~3z`>Z4d-r)IWd@kBe~ARTBCPpyVr zgD*7Mvn`IG#le@=YyZ}J9Y52(YT@yuG0MXN17LXaeHtEucBhY&HBhG+p*#q&9(rhW zeoMmxLKq7VT<+0uzf`qoqv3_?d79eCQvEdC%fdKlba#YTx;mQP^G|v@eADZ}LBEcc zcC%8TaEuo2>)F25kY(5i&)jNgSCtU{q^uMe1s3CN8gf$DF(n?KxRmu>L&4`u-hk+*h`$oRg6!7XFfU%ni?XPH%v>F+3jmqI%CFdpeNXXxqb`T zronjEzew?d0L8G>&w%d&)8rcDhUm~deT5PahkD|V;A9rNVO~g~;*rpNW<8dLt!AEr zqq9uRI?SIP$E?Mt;o;1#7#I;qAjU&YT(EquA4@x9&%CM38Z<_FDb9)Vlb^ILT6um| z%p9d-eQdPir*VmjBjZyQ-%7|-9I-Gw;DAXv zUyNbE6x33i@?XpI<=+3q@sN`?K)(qMmZr<^T!Wn%TDc8>W!lSzu$A9gJD66nUqJ)e ztKZAn;x(USR%CsZd1CEXwe;CQ+q&;eUD?BO`E||^9TiS6n)^lF%n1ve%pd3|(W38q z2g08dvwB>c=TGRcamO3^!W|0}iQ|muRS-t#IC96b4MI<=m^WZop^@;HsBMabH+WgJ z5f^WACcHG#^jKMJOL%Fh8KAXfjBk_L;o;`r>UNRvX3LQMHBmY)V_XIOTL;x0QlYQ3 ykC(*3^KCu+bun29&MH@Uy!{lpVV&t}6jS0#Pt8ckOiD{iHU+OtOj?>SgZl$ypIj;c diff --git a/gfx/menu/luminos/clearbutton_f.tga b/gfx/menu/luminos/clearbutton_f.tga index 1ef420399e8d447c7cc02565b2cb8300d1d9112c..be0939c0675b8dddb74ff51e14a504a61d5f1ca3 100644 GIT binary patch delta 3363 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 NJLXqZ)y!~5{Rb`Rpm6{I delta 1428 zcmYk6X-pGA6vw+@mqIIBsHL`rmQpSSQHd216c9BYAmW9fD0svRMdO(mBZ`W*!1IoR zcwczE4}LLdVl?`vsaQTiu>qDztBg9D-bD2g_$=*{ zk5N2KuqQMIoMG}1krpTkyvgK2aCCdk@Ibx(3#0w`Rj-#A?}MN6Z-#sEdys|O06E5J zNDBVJLiHFI;^d(^%rUw-*J8OTh4UV)?ViSYH{J`45)3yT5#SDY!JkkAv`6b9!Tgz( z-KB>5hCO3)C(nGrM`)K&%3enE>f7e2Z2Xg21#Ch=3!!Fl&zwsZnyReIo2 z^hYK=&>C-t%oPUs;Q4M+3wixjRRMlKbS`$I!y6>A@~Vrz*a5tx7uUxP=bQ`$l~(ME zAEL!ZCr;Uyijy6oL1K+IWV7!Pzd2 z3v)z81)GM6>#5+6+<{t7@rYp>-x)blW8bJTl0jWb@!x2CyHFMTiY;fxOg-_7h~7z#n5uEk z16i}bu?ZB0bLWtqpQNr0Tjmay*pPB!uX&`Ir>P%_JLhLeY>Y)=*8*}8&r;uxg^S1` zo@3lx(OZ(wQ+8m$64D-ZC^~UkWuzpl!_bKhOUX$zvz#Z($VIqBIRXvKyGin8)rT^p v6;gssFn+~j`3kkHkh}61!!R((F|cmc1N~JRf%4UD#%q+w1SLO^wZ`=iwy|y? diff --git a/gfx/menu/luminos/skinvalues.txt b/gfx/menu/luminos/skinvalues.txt index 21944b67a8..82d188cb62 100755 --- a/gfx/menu/luminos/skinvalues.txt +++ b/gfx/menu/luminos/skinvalues.txt @@ -183,6 +183,7 @@ COLOR_DIALOG_CVARS '1 0 0' COLOR_INPUTBOX_N '1 1 1' COLOR_INPUTBOX_F '1 1 1' MARGIN_INPUTBOX_CHARS 1 +OFFSET_CLEARBUTTON -0.3 // item: key grabber COLOR_KEYGRABBER_TITLES '1 1 1' diff --git a/gfx/menu/xaw/clearbutton_c.tga b/gfx/menu/xaw/clearbutton_c.tga new file mode 100644 index 0000000000000000000000000000000000000000..d8bfea5adba70cf53445464a2d254f3d391acdf2 GIT binary patch literal 2232 zcmb_eTPUS#82-Qg|6|7HLN1UCwxnD*U63SL&)8$i znOsOMhfW7jmzU-W~I0Xa*P&3~MXJ=>X=;$CT zUuna`!vqhNOFaM*5)x>0bCdXKZEYndCnx&AH(FU)8Cm&bv9Ym1@$vCy02`a>IXO9W zc6P>wR8>_)?-4yUHI_oDCNj7wYWn1i;G53dP06Q6m5x_4Az=85tpOZ*MaQOpU<6K$@7C z0LbX*DEayM5pomd<>hFtEMskL4FPbcGHK#?Mq*+jZEtS_q@|^WbX}MAij zBmjnnhRD~~m)M^>pw#fx0c5Qppt@H{NlCQ3y92rTTU%7iu^pO6Rw^3Y-ehKG(&gnP zl3Z9=fC8V+Pg+M_%25twNJt1&jTpwjz<@)%=jZ2?m6aujSGgg)aCLR1o}M0Ak#|1G)l16znomC(ujzNfHoL`fw(Z!R}+p7)yprT!NEb8Vvuys z@ZjJ8S=em07Xh@$$VjrX)J0oc8^+`#>)@xnygX3H^Y>C@8}IHbTn*iY?z8af|;6{0$*QWg0ZKk=a2a>E-pe~U?7*jr>7^3 zkB?hon`QkepziK&g4@r}52mN5soUoI($cuxk!y2vvnH0=_&+~CLv?jE!5<$V z51X5t8obsFy5|L)AU{7JZfE-@Lp$xV*gNbz^+} z{r%*3PC?Gh6B`@L)solO5au628C(pBPsiHY8bm}ykp2w~4e<8%ChAK3OG`@-5D>t` zM}F?^?l3w!${lZ3{s?w*auU3~y$PqjzCJE~bmE@R$jIPwM}GP}uMT8p{)n@ytBdgR z_xFdnxj8j-@{Ye3RaI3&?s(4Y_q;lY+4(;{K0myz&2>cQ6%E}6ag@q9f8XFq{bLRB) zbm4d3($b=)DSUSn{zzbCWCYyY+{hV+8qhOR&jHW*+uK_qXLW;q?5C|%h7@MK)L3kJ z@95|tF@l1E$o(cVGEx&$o!i?IPhqJU|7jaSo;Q~*7}b4dXJ^67%Zp%6PEIDdBDM9o zy?UJJorlRN^1Qi3xOo2K<6|bbFDWUp+5T4v@LCdm_~g93eOGFMVk6725o(vVDTR{jeM3&K5*=RMwyt(Bvr zBTIfP!gx9sfjBWjj5{@(~!b&(u1;P&)b^Y zW9;GKVQ_VI1s4|=7#bSVPsiX?7qChaW z{~Pyt8c$#E@9$gk2-Je^As!}s^S74UBfg@dA`4zUukYCSeFX;xlQnN`Z6!m^z<+OV z4=`uvJ#}?;-@4CyrN_j?1mJmy_eLyc;E(_9TYJ9Z^xbwkml^mA^cSs*z5EI+LyEod z|8yQh$SXmAipyT(C4XZSu-E$ibRJ{a%cxQTsen{KDj*e*3P=T{0#X5~fK=c=P~bN@ COlZ3R literal 0 HcmV?d00001 diff --git a/gfx/menu/xaw/clearbutton_n.tga b/gfx/menu/xaw/clearbutton_n.tga new file mode 100644 index 0000000000000000000000000000000000000000..60ee8c8d1048f3d3dbc6a1dc8214000e8d801ce9 GIT binary patch literal 2612 zcmb`JTPS5=6vy}H>|tEv2}zNn$hD*hC(J}N%B_(Hx$~gBxF^k-;T&enq)Ey3fs-W4 z1Epk;Bp%!zlq4R62YDc+WR3OzT*l1aGgC9WXz%mw_50TCzrL*~4$8x2RE&zx%WwSn zxBo2s^61?ked0T<$9KGHrMnAvPw)Njh4;LNy0^DSX=!OBgrL;aRNCF$r7yf9uCA`A zw6v63cuC33%p_Q7dG!IP+1XhN4h|*`prWFJuCK4@Gp{J^?d{aUKZ}r%5Sp8t(?_+i zfnjiPklftdfNE`Rr4Ig8jE|3#mzNiP0Lsb9iTe8b2%Bqp)e4l!WCF(B-JOPphUgEzA&Kw*ZsHdlg;DiQST`-b4Y;(YxcrJkRkQ$axia8XfFw6wHDCf?+y-db2#kY&;G3Z=K( z-rlC9q$HrSva;yl;DABInR@E3hfE<7E!Zcvc`-FLMgIQ&fK^ph5zEPFG~VZ^wzgLG zn-%~)t#)^JlfAt?O3nao3R!yYq~qgbeE_tjHa0e5cW-ZR$TcV^h)mD422Zs-0N|z7 zY9(i9XFy_NV$kIe&kq`duUZHx%+1YBs0sV3xw*NIQgL;4rQzXWDPS!CoD&xp7gShS zC?i+P%F3vys0bcKMn1hfG2mp*LbbEVCx?O<;BT$OjY?j`L@bGY2TwIjBV`yk-fH%Irz8Ds| zCk7U9TJhw2ep;bj)zi~c%FD|Gj)PxYThl+sP$|J0dp=pD{#RF5(QBM?MsnD?2Q?NR z)h3VR?Cfk9;nX*<4t#uk;8|T=-5*fO%E}70u*5`pc{zmI$(ph0@9#$g@GSVfH)cMo zzOvCfzSDi#idQ(wfB7WR{r38HNB-;2IIWl2p0BKo>{mG{nJMXSg5SPQNqZHdd= 1 - me.cb_size_x) - if (pos_x < 1) + if (pos_x >= 1 + me.cb_offset - me.cb_size_x) + if (pos_x < 1 + me.cb_offset) if (pos_y >= 0) if (pos_y < me.cb_size_y) return 1; @@ -368,11 +370,11 @@ void InputBox_draw(entity me) if (me.text != "") { if(me.focused && me.cb_pressed) - draw_Picture('1 1 0' - me.cb_size, strcat(me.cb_src, "_c"), me.cb_size, '1 1 1', 1); + draw_Picture('1 1 0' + eX * me.cb_offset - me.cb_size, strcat(me.cb_src, "_c"), me.cb_size, '1 1 1', 1); else if(me.focused && me.cb_focused) - draw_Picture('1 1 0' - me.cb_size, strcat(me.cb_src, "_f"), me.cb_size, '1 1 1', 1); + draw_Picture('1 1 0' + eX * me.cb_offset - me.cb_size, strcat(me.cb_src, "_f"), me.cb_size, '1 1 1', 1); else - draw_Picture('1 1 0' - me.cb_size, strcat(me.cb_src, "_n"), me.cb_size, '1 1 1', 1); + draw_Picture('1 1 0' + eX * me.cb_offset - me.cb_size, strcat(me.cb_src, "_n"), me.cb_size, '1 1 1', 1); } } diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc index a4a4f9e80e..2cb85a7a0f 100644 --- a/qcsrc/menu/skin-customizables.inc +++ b/qcsrc/menu/skin-customizables.inc @@ -160,6 +160,7 @@ SKINBEGIN SKINVECTOR(COLOR_INPUTBOX_N, '1 1 1'); SKINVECTOR(COLOR_INPUTBOX_F, '1 1 1'); SKINSTRING(GFX_CLEARBUTTON, "clearbutton"); + SKINFLOAT(OFFSET_CLEARBUTTON, 0); SKINFLOAT(MARGIN_INPUTBOX_CHARS, 1); // item: key grabber -- 2.39.2