From a3399b26aeb6200dcd452a993da3242bd7e4935e Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Wed, 21 Mar 2018 15:14:21 +0000 Subject: [PATCH] iconedit 0.35: implement preview, block hover, use mouse events instead of buttons git-svn-id: svn://kolibrios.org@7200 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/icons16.png | Bin 9230 -> 9926 bytes programs/cmm/iconedit/iconedit.c | 114 ++++++++++++++++++------------- programs/cmm/pixie2/pixie.c | 16 ++--- programs/cmm/pixie2/skin.png | Bin 4495 -> 4171 bytes 4 files changed, 74 insertions(+), 56 deletions(-) diff --git a/data/common/icons16.png b/data/common/icons16.png index 4fe03c7b32b9d0c0e7efd3e0d29191ec6aa149f5..8d5eefdb66b21c78cabe78db28aab57efc847440 100644 GIT binary patch literal 9926 zcmV;%COO%OP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXfCR<5FK~#8N?VSmn zPWArBKhHC}nPD)@G`1l$mLhb~rKVD76H>a-rCX5}O9+)HA$7G;w75#j9#S+dgj>{v zu{G8i+cd-M`|`{@|KIm_&hI>DeU^E;FYf<(*UxV`zwhV#_Om``Y)%IJz?OA%qci=7 z5pvW;{LM?zxXoR1%niF2HE>p!9@V(Kq??_T?hQ7|*zKWRK+Q>6k`Wq(!XKvL=*fL@ zf)P%jFTGCg+q#r$$o(5^_|Rdvt2JKzY%59wDk~Dm*$hT%fWv zk4FfHv%;fOW81r|qqA;IYm{XjK;zifadGd(lk zxnf&754*!q0@~}+89k7mS&k?cA3Zd|ZAml&YU9vQDb16JB4B1La3{jMapYUOk)A58 z2?Pmc=9eR%iRG7(F0U( zb=B1E;FZ9*dpgS@w)n6Gc*>iu0N9xUO3}Ii`XHh+!k9IUNp%shjiKa=!hS zUk}TnM|A6!fP{qBXd2%Xu}xzU9UG0P=qQ9nM98^Zcs(2SEc@3h+`r`3gKDQ^ z(*ns?xjCe-1UOmoj8@w^9p<{feEtE|8fbGkx1j9Wt&(aHlF+LoSI8$J@CZT zmtW)lp#FDi*98*r#FUrjIkO83oGFKn@~|39f$j4;b6;&d4ZkWo-5r3;KnjVIYrzjk$?2= zsxc-Ei>laj(Wze)9u5c)0Lhp=PAaqLJDHzLT8sx~hv4DWuk+jw*$0cvI5ZLGx)f85&HtwE&5QLCFB zl?WRdtM~lS_$AjU-MI%bK$pVc~}`p$1=+lUxd${%TU}C&%BO9hYs`ftdbz^6N*57zBCWW z7hytN?h#p8S=?9WQ3Q&LtGR#rz+NRxhGax;@Eu)w8bRAd9_7G7)N9@j1*d=Kj(B&; z*W6b_dDPgbAx4aS65IA&kdwS8{l}HA66B@rSN7})Dn^J6pO0upz~Kg z4y2^o;rDuAx~%(xZQ}DE`c(pu03D5M7%lXuDinU^2xhZjECBF9v1urxIv>(?*U80#5!MNc{8 zLMcI?=qjMs9dgW^tFAcC{T{bI$$dg8LDT3)9$iY6R00YMloC)Cyn~kYe7u<`pZ5DZ zl>MGem%w^pR)TAuvA&zHX8%9?S_@1X?79_f#=2c;_+mm2Yk_8s!*S+(iJW4Dwtw|( zFY`;Dt0!!6-t*6&<(LumcE20(zes>?yv$vbqI7Y7zSO{q0A-lH<^VcR`4RS@P$dIF z+g@kK%@#5Buwwl6nEgOU#R%;5=owk}=F{hLON;=Z1BOQ%Y6A^ZFZo)Fcr3HNs_`NdfddG-n{(-N*LyrfC@_3c};*N-uaNh}CtltO&DhBu zp}#ic0$~Bg+zCjCTt$8nBL4W58|e*e@-w-wDFGLepZpUfqA_IKgrR^7oXpJRPM|Ll z8R-p+}3rUC*XWM(K(1TMdS;6f^aD@^=H-#^d@ta|=Qe82xVZtB02M^Aq>`^=r)2B>|U+9{cB0A4gVB9rWzk6rXKwfKg8z#%EvGM~|M(keMBZE%PS3 z6|qyX7f-Fr_IwuGH|@lGYgge%=Htv6ESeI@t3!rDM2|hOLo1A$Q^+GX+}R7G1`a{* zJN`-|6r<)Ag0_pjn+iNI=RL$UEXB`kIlLh%1p=B+Bj_uu9qARxfE_YeLWcA9r375m?1&3OhZ{ArBnUZg4G(DO|tPK}mKr@uZh#WukM&5m*8_9oT#gBZO zG6Ds>C1gB}NVCQ?ErC1qB{0lJ{kgCjv$OR-XF5~hfB1SqX@en;zJSo!1fEDt8Ig#D zca{=O;Gr~}I&JZOA}P{7=8o&f{*6Fp=2?8WZWo%yMPb~~MECD2lkwY&Kg0C7 zbTtxzQdTQ^z5bCwJ#aQ7AB&c5;nlHxUzv>O&K-xiP~*Jn);1Q$bLo{^DXwo^f?K7Q zM`2e!_}&ZC_oGMW&WMkVLi`m`$SxG`?DG5uxIjW^KBDr|as23Ue7Y|b6X&l-KD+2n zzmSROx}mawxrqJgQGdgfDQ_Y)G!)k~m#$L&sE$PXxpE{Q&PVG8Bw#*12s;f=5}7-9 z5w<0#;*SgG_=Yte;*GIe-=rnAq;?($5 zf|O5H^U%Mzy!M0ZGy4c2hr|}wWy!G685xDab?r>ShT+vlCz{IKLUdQwXd^HEFN*3 z!iRNE;I7JbnDpp5JbZs3diLmof1lC{DCfl;sr*cDeQy@joyS&`^0rRA70{AQ$} zDs?AztarU`+6c{%lanLI82%1rzbBLb(|P=)1^x?k8azyn`bNsyPp#*IxA;oa#juD^8!u*EloW3N&vPrEzBXR084D_*4Sn)Lh~v z_$B#-;)vuuX_`34-+|=+Z1j6Q=zr(mYArDH#phvL^h0{B1orMbjMG1Siog{sR>(;b z&0Ds^_1!!1@K3u_a5~L+PetT8{R3OpSH66ooGfww3#$|XGXARGX&zQ{M;eqoZpVQj zWR7$nPxxxQ5~!H^G&d$+kA1>(??X5%gt1u(0_VT-m>jf5?AfdYf%iY6RgFlH-fSQu z>NUU}soH1nL_|UZIm8B1ZN~wzVg5A#Mj~NLPp^Fm9)EJ0cirfY{|5s8FDPn(zt3)j zyV|~on3xzIPyDVLE3eL0;`SM{@WF;VL_5Y)O21hr}d;#~Pr{Pp{9YF7neO!zFIHYWH;l*61)E40rY zx9`;6`cNAaf9`Y^(B1BzfBF^`6&3uRYDh>hyPgU|&+BhBJY&!Zkm1)~twKaZINEpY zj+jRE(WFTu6cm&rH?Igk{d)^?bMrCao(B~nMSzUI+O!g5#yo}e^s}(rZ73=#LEE-X zap6KK0@x*AP+%ZZj%VQa4;^VPl{bzg|7ofdgd1Wg^Musz^8txJk>4tPQb2R|_f6vjgD9JsJN{1bT zZ@vOi4Pv+*ufnor%h0@e0yCtW&(*m3X8Oepy(RA&CX3%+f(LGkgQF&xU3@M;VP$>H zUv;IFBR7{_CkKR~#vaLz*HQTPhdnISj(z)%;)NGpz<~qDG3v305#@Lb4Qk$o)8WLi z4*igpVUsR>bMp#tW7w^zu9WIrX(sp`V|D)Lr~|Iy$C}U zva_=#fso)JRJ8d66;-UkSlnJy$sd{AH)J?B9>RRWZmVFuQ-jK_?O_WJMtJx^sSVzK z`z_p-*cSoy+pvOH41~f zJ0!pcTV)xB{TzwDo69lh`7y@1poZGyjfKnjPcJGfEBROs4-3QC$6b?1U@G7X9$$DK z_tf9fwM$z$W`eutjC2M^+mnAgLIpKNX+%A*y|EH4TD0KL8Q*+IdUw|hV~RN9yRK!DOI2aw6c;G5Xo6V zrBYW-5hyLKWUc~bWmR0Lk_{qSnFQ6 z8Yu>GaSae1&DKa6tE%yFAYLDJ2UU&rAal|<2?>#YWX&hjZ+l#KECtj>^q_k8?nCUj zNb6r1f`Wp$qgN2AbbQAoV1~OnA{^zhoX*}pe{{PZm{m>BpY?daypEn6*(%fd$(_<~ zSiNOIFX_c_Wgrp#*l}O@p27l+z?SrMgqDY58@pa6=PoQzsz8uBWq7@hG*x%*Oh&I> z(z9rN7?AR41b7M9e^LestFXYd4QNkdZ&qOeFM&f|NPQ`Ru;C?O3lYbc5(t|=sSRW~ zQG(7rx^w3)ENo0muy2>^dni_60T&3Z7lOH+)gw&%4J0$jhPe387c>K@HhBGgAErB-&2Peec6gIhB|Ls#IlZ(9V~eWr!hN$bW5qPQUMC0%^&*uL zN^KCF%RdV&oGtG+M7F#IP5(L?v+dECaQAeyZ`}&*`do)s1L~u5-`Nn=RtD0ZwXUDz z6V(-km{nYjHtp`jEggGebNN?j(kd2bvNCb|$B*O5NXb+l%F_LE`o1!`zuf%^^80)Y zN6Q=W=D?S6+HnRg0$QQ8xD0KtZ-qV0>SBMXbbQowqw;;_pi@XoTZx#8d_22k1mdcL zu`hKiZV0;)fnR3guN4iDA0@pQ&js|~SH6&zfxh8wF}=ktIAp5=JD~H!y2Dw`E@;B= zM#3Nr4U(P)YDyr!uN)B`h$|Y0BQ7Qa*VK)cw@T2kjdtvnA`C9z?)%EE!|Nfeq7<=? zP()V-;HvP3a!v^@;O_g%F@bD?S5+c5rZJiXN1$1->!gG5_WYa8ee2;4WCRY&)Lwa3yYcU-GY=oK&Mya-#3y#xcNg}OG?<0KoOt> zx@X`EZf`*Nf_XRkfZqbP_uhTiziuRfkq=8hi1w9#EmQcAFV`KS2glTR>zzV%lJC@LQ>Ke*!uPB=ig*vUE!Yq-3O7wwc>x} zdng}{zR!7YkIvjzr<1Mb%2m&VfzsNaaUmS5e;$h=J>SB9Ic@$I(s9IN8w?y2ht;2V z0@Al}pW zyNilT#^h66bRmZZgLCVRe4se1@+F_eMVflx=pET!{O_SC0-kPxT0W>C0m9v+5w#;}-hDs;^h>c+ z)|SVZJI>q@<_EY{ONJ_`u~QP=%pl(p6ogoI%(KVG^Czz4csesQvE^_9x@x9h6ICZ9pz6>e1o!C! zdg@5&b++&z0xl$C`lcKoLuxC~j> z${_)-0+nE6ix&9h>8FvlX%liYGEhP1KrEfA;PwLwG!Blkt`w~<98FO^P5<_HY!8+` zxTD7KgQ&~X*@aXBSD5g6IuDo>2zvl);pgd>)q!|mMks1nUv7BK;r{Qj&^6=v(Ak(c ze+;VGs1kn(gu;||`;&pzzi%Yt=a;m{6K~&$q-`JZ6IM|T3R4f@8Oz(_ zp*Q03Tk>w~SzUog6Tg-P9C*6_Hl9Y?D9@lNu4gL(J1rWeC0PigRfRpCiPu(XyfauyafoGmHXcv!P+eLZ@%S^!Q*{J8z`5wx}7tpkU?OE;D&7H4Ge^JpY zokIcyCV%B@_5LYmQMJ=KVV8r)1r(+<+D3WQ+jtdd53O2vM9M#!WA$-qG@3!%C=caz zl}feeB}b|adk~0xlt*0>F5t;npckPyufnj+(l30jj;oIWH}p0%8bN8ajq(t}hWCQl zIG{~94(3UnGJoASnqHVNNcxL$9qZe$;aCYae3u008-umIFkn-mQXO?wC@hLic`$B` zyhZo*0e#WE83&gqld25{^y(3F5! zIQUKkgd0z!^i-D=%KW%JpEcb^@y7eC-727OIR!po&dQubk@bFij)+3ZDz? zWXi8Kk(WRYYiP1Sx=K0sr1Vt^D@+@ajK>TdDaYJn5D><9#oj5WxJOe3weg<9U+~=W zR}ssu*sS>N-V~RB-nd?HB;rD)S?8#6prWRdT?$s9lKE>g*W!mQyLkKX$)qwOna z6iGh-D{>Sf-%)^SXEnR{H1=|ASYxFMcKW9Bcq-o1tz@12njbZiE2o+tX3%v_5O2(i?`dT7(3sbnY;W zL{XjGBhpJ6o-myYLc|*^XQQ{6mcSR>3Upo5i92_AEWx0jck#Jmg+~FJBQ#g6L;~Fv zF*q`i&rTA-Kxx+MmpDG1r}ul7M}qCa2nh&52=fE&(qS{B{IpvU<=}d-!1|!tq)uZ? z5v2_d7yphEr6+Kv{49=@9K)HivwS@u#QH$%g}zOc5}dCzexl)I*+~T00uU8g52wnc z33g@V39S3s^(QFZ_5!U3v@X#4Al3?6H)xn^s&Js-kmp+Kk?78t@F?KUn7G8(0~&2]h}K!!AA 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 && (mouse.y>y) + && (mouse.ycanvas.x) && (mouseY>canvas.y) - && (mouseYcanvas.x) && (mouseY>canvas.y) - && (mouseYcanvas.x) && (mouseY>canvas.y) - && (mouseY= BTNS_PALETTE_COLOR_MAS) && (btn <= BTNS_PALETTE_COLOR_MAS+PALLETE_SIZE) - { - if (mouse.lkm) EventSetActiveColor(1, default_palette[btn - BTNS_PALETTE_COLOR_MAS]); - if (mouse.pkm) EventSetActiveColor(2, default_palette[btn - BTNS_PALETTE_COLOR_MAS]); - } - if (btn >= BTNS_LAST_USED_COLORS) && (btn < sizeof(last_used_colors)*sizeof(dword)) - { - if (mouse.lkm) active_color_1 = last_used_colors[btn - BTNS_LAST_USED_COLORS]; - if (mouse.pkm) active_color_2 = last_used_colors[btn - BTNS_LAST_USED_COLORS]; - DrawActiveColor(NULL); } break; @@ -527,6 +536,7 @@ void draw_window() if (Form.height < 430) { MoveSize(OLD,OLD,OLD,430); return; } right_bar.x = Form.cwidth - right_bar.w; + b_color_gradient.x = b_last_colors.x = b_default_palette.x = right_bar.x; tx.n = 10-TB_ICON_PADDING; DrawToolbarButton(BTN_NEW, tx.inc(TB_ICON_PADDING), 2); //not implemented @@ -547,7 +557,7 @@ void draw_window() DrawEditArea(); DrawActiveColor(right_bar.y); - DrawColorPallets(right_bar.x, right_bar.y + 70); + DrawColorPallets(); DrawStatusBar(); } @@ -621,50 +631,45 @@ void DrawActiveColor(dword iny) sprintf(#param, "%A", active_color_2); EDI = system.color.work; WriteText(right_bar.x+110 + 30, outy + 3, 0xD0, system.color.work_text, #param+4); - DrawCurrentColorGradientByLightness(right_bar.x, outy+30); + DrawCurrentColorGradientByLightness(); } -void DrawCurrentColorGradientByLightness(int x, y) +void DrawCurrentColorGradientByLightness() { int i; int w = right_bar.w-10/2; - int h = 30; for (i=0; iskin.w-15) DrawBar(skin.w-1, 24, 1, list.item_h, theme.color_list_border); //Playing control buttons DefineHiddenButton(7, button_y, 38, 20, BUTTON_PLAYBACK_PREV); - DefineHiddenButton(47, button_y, 38, 20, BUTTON_PLAYBACK_PLAY_PAUSE); + DefineHiddenButton(48, button_y, 38, 20, BUTTON_PLAYBACK_PLAY_PAUSE); DefineHiddenButton(87, button_y, 38, 20, BUTTON_PLAYBACK_NEXT); //Window control buttons DefineHiddenButton(Form.width - 27, 1, 26, 15, BUTTON_WINDOW_CLOSE); DefineHiddenButton(Form.width - 55, 1, 26, 15, BUTTON_WINDOW_MINIMIZE); DefineHiddenButton(Form.width - 83, 1, 26, 15, BUTTON_WINDOW_REDUCE); //Other buttons - DefineHiddenButton(Form.width - 53, button_y, 22, 20, BUTTON_OPEN_DIALOG); - DefineHiddenButton(Form.width - 29, button_y, 22, 20, BUTTON_SHOW_VOLUME); - DefineHiddenButton(178, button_y+3, 17, 16, BUTTON_REPEAT); - DefineHiddenButton(197, button_y+3, 17, 16, BUTTON_SHUFFLE); + DefineHiddenButton(218, button_y+3, 17, 16, BUTTON_REPEAT); + DefineHiddenButton(237, button_y+3, 17, 16, BUTTON_SHUFFLE); + DefineHiddenButton(270, button_y+3, 17, 16, BUTTON_OPEN_DIALOG); + DefineHiddenButton(289, button_y+3, 17, 16, BUTTON_SHOW_VOLUME); } else if (window_mode == WINDOW_MODE_SMALL) { diff --git a/programs/cmm/pixie2/skin.png b/programs/cmm/pixie2/skin.png index d79959ac3804f9bbbc72764ff530ac178c64dd25..d125e8d427d40d93a009fbc1e4965495d69e7a59 100644 GIT binary patch literal 4171 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