From 2b5fa62c5889ecd8cb9591975dc12b3b7a18cfeb Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 4 Dec 2018 17:25:09 +0000 Subject: [PATCH] TH - pointers --- data/elementary/themes/edc/efl/cursor.edc | 30 +++++------------ data/elementary/themes/edc/elm/cursor.edc | 32 ++++++------------- data/elementary/themes/edc/pointer.edc | 6 +++- data/elementary/themes/img/pointer_hand1.png | Bin 1382 -> 1603 bytes 4 files changed, 22 insertions(+), 46 deletions(-) diff --git a/data/elementary/themes/edc/efl/cursor.edc b/data/elementary/themes/edc/efl/cursor.edc index a62817708b..3d4c3e8554 100644 --- a/data/elementary/themes/edc/efl/cursor.edc +++ b/data/elementary/themes/edc/efl/cursor.edc @@ -82,6 +82,7 @@ group { name: "efl/cursor/hand1"; images.image: "pointer_hand1.png" COMP; parts { part { name: "base"; mouse_events: 0; scale: 1; + scale: 1; description { state: "default" 0.0; FIXED_SIZE(32, 32) image.normal: "pointer_hand1.png"; @@ -91,10 +92,10 @@ group { name: "efl/cursor/hand1"; description { state: "default" 0.0; visible: 0; fixed: 1 1; - rel1.relative: (26/32) (9/32); + rel1.relative: (21/32) (7/32); rel1.to: "base"; rel2.to: "base"; - rel2.relative: (26/32) (9/32); + rel2.relative: (21/32) (7/32); rel2.offset: 0 0; } } @@ -117,25 +118,20 @@ group { name: "efl/cursor/blank"; } group { name: "efl/cursor/xterm"; - images.image: "pointer_entry_bar.png" COMP; - images.image: "led_dot_white.png" COMP; + images.image: "pointer_entry.png" COMP; parts { part { name: "base"; mouse_events: 0; scale: 1; + scale: 1; description { state: "default" 0.0; - min: 15 20; - max: 15 99999; - image.normal: "pointer_entry_bar.png"; - image.border: 0 0 10 10; - rel1.offset: 0 2; - rel2.offset: -1 -3; + image.normal: "pointer_entry.png"; + FIXED_SIZE(16, 32) } } part { name: "efl.hotspot"; type: SWALLOW; description { state: "default" 0.0; visible: 0; fixed: 1 1; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; rel1.relative: 0.5 0.5; rel2.relative: 0.5 0.5; rel2.offset: 0 0; @@ -143,15 +139,5 @@ group { name: "efl/cursor/xterm"; } /* efl.content.hotspot is the old name for the above part */ alias: "efl.content.hotspot" "efl.hotspot"; - part { name: "shine"; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "led_dot_white.png"; - max: 27 27; - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - } - } } } diff --git a/data/elementary/themes/edc/elm/cursor.edc b/data/elementary/themes/edc/elm/cursor.edc index f836f9da4b..ad0cad34a9 100644 --- a/data/elementary/themes/edc/elm/cursor.edc +++ b/data/elementary/themes/edc/elm/cursor.edc @@ -82,6 +82,7 @@ group { name: "elm/cursor/hand1/default"; images.image: "pointer_hand1.png" COMP; parts { part { name: "base"; mouse_events: 0; scale: 1; + scale: 1; description { state: "default" 0.0; FIXED_SIZE(32, 32) image.normal: "pointer_hand1.png"; @@ -89,12 +90,12 @@ group { name: "elm/cursor/hand1/default"; } part { name: "elm.swallow.hotspot"; type: SWALLOW; description { state: "default" 0.0; - visible: 0; fixed: 1 1; - rel1.relative: (26/32) (9/32); + visible: 0; + rel1.relative: (21/32) (7/32); rel1.to: "base"; rel2.to: "base"; - rel2.relative: (26/32) (9/32); + rel2.relative: (21/32) (7/32); rel2.offset: 0 0; } } @@ -117,25 +118,20 @@ group { name: "elm/cursor/blank/default"; } group { name: "elm/cursor/xterm/default"; - images.image: "pointer_entry_bar.png" COMP; - images.image: "led_dot_white.png" COMP; + images.image: "pointer_entry.png" COMP; parts { part { name: "base"; mouse_events: 0; scale: 1; + scale: 1; description { state: "default" 0.0; - min: 15 20; - max: 15 99999; - image.normal: "pointer_entry_bar.png"; - image.border: 0 0 10 10; - rel1.offset: 0 2; - rel2.offset: -1 -3; + image.normal: "pointer_entry.png"; + FIXED_SIZE(16, 32) } } part { name: "elm.swallow.hotspot"; type: SWALLOW; description { state: "default" 0.0; visible: 0; fixed: 1 1; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; rel1.relative: 0.5 0.5; rel2.relative: 0.5 0.5; rel2.offset: 0 0; @@ -143,15 +139,5 @@ group { name: "elm/cursor/xterm/default"; } /* elm.content.hotspot is the old name for the above part */ alias: "elm.content.hotspot" "elm.swallow.hotspot"; - part { name: "shine"; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "led_dot_white.png"; - max: 27 27; - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - } - } } } diff --git a/data/elementary/themes/edc/pointer.edc b/data/elementary/themes/edc/pointer.edc index b988b85916..6fb7aebfbc 100644 --- a/data/elementary/themes/edc/pointer.edc +++ b/data/elementary/themes/edc/pointer.edc @@ -3,8 +3,10 @@ group { name: "e/pointer/enlightenment/default/color"; data.item: "can_suspend" "1"; parts { part { name: "parent"; type: RECT; + scale: 1; description { state: "default" 0.0; color: 255 255 255 255; + FIXED_SIZE(32, 32) } description { state: "suspend" 0.0; inherit: "default" 0.0; @@ -383,7 +385,7 @@ group { name: "e/pointer/enlightenment/rotate/color"; } group { name: "e/pointer/enlightenment/plus/color"; -inherit: "e/pointer/enlightenment/default/color"; + inherit: "e/pointer/enlightenment/default/color"; images.image: "pointer_plus.png" COMP; parts { part { name: "add"; @@ -422,9 +424,11 @@ group { name: "e/pointer/enlightenment/entry/color"; images.image: "pointer_entry.png" COMP; parts { part { name: "base"; + scale: 1; description { state: "default" 0.0; image.normal: "pointer_entry.png"; aspect: (44/88) (44/88); aspect_preference: VERTICAL; + FIXED_SIZE(32, 32) } } part { name: "e.swallow.hotspot"; type: SWALLOW; diff --git a/data/elementary/themes/img/pointer_hand1.png b/data/elementary/themes/img/pointer_hand1.png index 68f356d069388f24c0c26f3f5e79dda058ec0a07..98c5b6495498c4d77e613333db5f308a23924e05 100644 GIT binary patch literal 1603 zcmb7Edpy$%6#s2wMhuZ>NxHZwQ!1i6%Oke(XjG_}m z81l&5T^Z5P)K!v|_p>|qe(pc_uiN>YbH1PNIiJrt=kxvJBs$nxOG&6m001C`wz0$t zk+K~ys4%x8J-US;LNG@=!GsnGyGj#s@emsq0sxr8w*%C}%!?Hkm5El)L`S?gk>nBT z1&~N2eZSxUf~QA_mp(q!hyL}13IK?*(UvEj!n0_S;wI;-n7>#qDh5nGeWg6w)PT}JUs+6gbiXzIChHnLY*suLdYvC*9w&%>{`xHTk4A{A_)p zLx;0E+aL_(ByZ(zU&5HG+I0xyuyEPK&fw%(Oi_Yk$<+6%*<7+aG!+C@&e$X#NAk<( z@vWQraOMF36#p#NUEttOjn@=FA5!$v9U~=j)80oN7hc*fGERaTxUltPa5CkRI0R@I zVlWZh^5uX*(3g=pX7lL}6B0%%NKxDf%$!0Dlr5AR-9;(dEqUdMM-F)SIvE1KbdL#L zhtV!R;sy#gO>Ri(97d^!cmowEVDhJ&w$h#JUA5}0vv`N5COfD>BAZ|NDC&ER-k**| zz!E(24_BRL4-K6s-n_Ym)mgkRvvI~-ACi@ob>IP}z?wiHnE96NCDdpWW8`o#gcbHd z7>07bq*}J)+si)%RJvS`+Jt`JB*aKNPBK^JZhJiTvv!MjuW1%I@f%^LT;B}*HD_E3|BF@Lh$1Iso8k-f^R&WF6zJA^6dj}5# z!QpV;-aUI*>KeW86jG*L%a-^&o*TVk-zBhbgOl!q)*Gy?+gELJXBO8=Fa@DDea0b2 z;w>nzlOJ|};J)!+jHns)%Gt$XjLtGk-h7@9t=ll+Yw|P&*H5KH>EjOREYqgb^3(4h zu4!!C!jZ}ACDql{2t@@2Btju6=Y~JuiN;?UPfAMS@cDcrI-M?7?K+!9tG9fO?utgQ zqAagr*QRvzLSPQ+jJo{vX-o_mt)o?O&30wfSVMmr^rD#k(k9Ym@d!&yL zOC{lU7^Eq)+ucTOyXFcv#uU_3x>2r$hTvgUq|uJ>wkN>bh+wGI@o}RWFDle9Hfn&_ zS?f2p&>^1&>hW}i3jUc}n~{l&!TSIVK`g#f(`IxgqvHtZMawg>O2nrgtPE!Ym$@$b zk#~|O+F38r`4+elJCCH~S+}ZMkU#dfXbrFyY#SCl>!jI7pZfhUZfU%jadduOgKA2j zJ(J4hRrTD|;DOHd5o%KB$D-^zYgKvA@8+4#Sa|{TQkUO5*bVuj#xwVBr9ziXK+;95 r$DIvu@v*HIQh+#qp{X&`bcS^ysm7iFP(w|^_z%FeRf92fH!&u`}l literal 1382 zcmV-s1)2JZP)G*~M6Ll9zOFq2I-yW7m{W@dIa$!4-Md;4-%wyTLzY5U@Z!@}Lm zeCIpoJ9oZ;=j-`;zW(Q>{0GnX$xr|R6lDki|GxJ1MnX3 z1@K8*TU)rNr-#nYPKw1MilV%H>(;FaKm}F-cQfEVS;}+32(Ywu>sAp8g~XOETLj<$ z8Za$?MK~N5U0q$mwr#PtwkAeKM#R~(X9Z9IJ_DL18Gm3C;4Q#6kx1llQ&SWB_U)s- zz8=SMxOeX!@p!!2G|jMSn&Ctu!I2|JIDPsw?d|OV#9}e7T)D#K%a;L0fmpc+1CIfJ z1^6lwi5xz0;si&J9;LOl71wpi=kwIo)-p3Q!}aUe5kjzY=T3I--p#IEyD&|Y@$qpk zUc5+OUmw5>@S_yrvaE*KsONRScYrv4{J5Bym=L*KPT00B=H}*v=Xs(~D2PNNA*QCL zL_VJvuImcV^F%tG7T2y_6UUAnD=B>r=mI)`CaIe$Knbh^UIly#oH}&q5S^W!R8>_` zQ&Yq2>@2mlwOE#g&*vi)3enKefa5qQib5)tVsLPfn>TOL+uMs|+zs3Tl0XJn0X#qi z)=~RMz~=`K9^}lKGqkq0Qe9n5JRZmA^O4Wz0a#sKB^r$~IXOu-nwsw5#sSUnx^5pF2Dfr2k;l5SAth2-~-+PzOAdPtGRID0v#P42q7K< z&t|h2hJj%iSe8XB7DH843WdUhGeAxzkd~2^BU>zI94IUOi@>?&=H~F#t5<1hX+cqx ze}ESX1#H_!*L5^aBa_Ks+cuVEA%q|p45F$k>2w<4Phd*+JS#7rVx{uS6KLAMe}DU> zOP7d7qvZ2>G);R5Je^JxkH^t^}f zLSG zjA0l!j*|p_0eXPn>nU;-GD zW@AAzwPY+w;KD|IUoQbgx|BNLZQw)TO?g43UT0-8wp97DykrWSVZD(l^#L!) zB63fK o3QH}X1$eXH1&{jwnL*3f-#tUR-uSKxrvLx|07*qoM6N<$g0%pABLDyZ