From 630f887657d35963fffdb9d4c83a6e6889bdaaf1 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Mon, 24 May 2021 18:07:17 +0100 Subject: [PATCH] elm theme - more cc work --- data/elementary/themes/colorclasses.edc | 9 +++++++++ data/elementary/themes/edc/backlight.edc | 18 ++++++++++++++++-- data/elementary/themes/img/bulb_filament.png | Bin 0 -> 728 bytes data/elementary/themes/img/bulb_over.png | Bin 1128 -> 393 bytes 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 data/elementary/themes/img/bulb_filament.png diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index 08456fb949..ed3d5dd94d 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -173,6 +173,15 @@ color_classes { /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/normal/shelf/translucent"; color: 64 64 64 128; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/gadgets/backlight/light/off"; + color: 255 255 255 0; } + color_class { name: "/fg/normal/gadgets/backlight/light/on"; + color: 255 255 255 255; } + color_class { name: "/fg/normal/gadgets/backlight/filament/off"; + color: 64 64 64 255; } + color_class { name: "/fg/normal/gadgets/backlight/filament/on"; + color: 255 220 160 255; } diff --git a/data/elementary/themes/edc/backlight.edc b/data/elementary/themes/edc/backlight.edc index fbf5739cfe..f64b9f8238 100644 --- a/data/elementary/themes/edc/backlight.edc +++ b/data/elementary/themes/edc/backlight.edc @@ -2,6 +2,7 @@ group { name: "e/modules/backlight/main"; alias: "e/modules/backlight/main_vert"; images.image: "bulb_middle.png" COMP; images.image: "bulb_over.png" COMP; + images.image: "bulb_filament.png" COMP; min: 16 16; max: 160 160; script { @@ -10,6 +11,7 @@ group { name: "e/modules/backlight/main"; new Float:val; val = getfarg(2); set_tween_state(PART:"glow", val, "default", 0.0, "full", 0.0); + set_tween_state(PART:"filament", val, "default", 0.0, "full", 0.0); } } } @@ -27,19 +29,31 @@ group { name: "e/modules/backlight/main"; rel1.relative: 0.5 0.5; rel2.relative: 0.5 0.5; image.normal: "bulb_middle.png"; - color: 255 255 255 0; // no cc + color_class: "/fg/normal/gadgets/backlight/light/off"; } description { state: "full" 0.0; inherit: "default" 0.0; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; - color: 255 255 255 255; // no cc + color_class: "/fg/normal/gadgets/backlight/light/on"; + } + } + part { name: "filament"; + description { state: "default" 0.0; + rel.to: "base"; + image.normal: "bulb_filament.png"; + color_class: "/fg/normal/gadgets/backlight/filament/off"; + } + description { state: "full" 0.0; + inherit: "default" 0.0; + color_class: "/fg/normal/gadgets/backlight/filament/on"; } } part { name: "over"; description { state: "default" 0.0; rel.to: "base"; image.normal: "bulb_over.png"; + color_class: "/fg/normal/gadgets/backlight/base"; } } } diff --git a/data/elementary/themes/img/bulb_filament.png b/data/elementary/themes/img/bulb_filament.png new file mode 100644 index 0000000000000000000000000000000000000000..95e36b0a4f1169a8cc25e21f469d8c6e51638fb3 GIT binary patch literal 728 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuB%foCO|{#S9Fx?I6t9|MX)jP*AeO zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IX1_q{7PZ!6KiaBp@9n2MW6k&T{ z&e5lMQg%fHmqts;0o_cs&;XAp4)+NsOc^IJ$xSyj>f5{L=8cHHeg08v-%5HH|M;5r zJX0BH8Bw6i=(COS{%@~qN@UVbpV?gVW{nk}|D>7WwjuL>O`Ta8D%-Ap^2}|yRg>#d z)9&f^-d`)Z|L*fy{71WM^&dFwdG$SK?cX=^{ih%ES62EJvF=YhCsRc6<@fpA#rMDd z{w}-rX{6wRS*|ngi9FML#*xs-a7{<+fd@mrTDqVhQ-tYqCN7Xzj}5clvl~s^EE|rA z?NMfmFb0Y%+@3h|_}-m0_xJz5ab?E2Gr#}+{aP1ZD-rjunz4Ps)^FOz@=A|1jQf=z zSt;4M967!;Gyd0&Ko^@W*WP{K5HfG|nLY2OzWuvwI{&YTv}a%UU9Z-#VZQb^^XQgq zcJ4=9U20xmcm3}xTs1*=$Gi2D3$ouDDd~kj%Q(mr#Q0k4Y=-U(N2ZAI%%dwBnprli zyVMiL$j+H?*Mn8WVO#cA$-RkvY9_lki)?sonymhxOQZj0({Z2N!+Z+H91mu!4C_(* z!oy^d_Dbaqi%l~_-^vgNMj3^MWEg#5f;VM1KI1J63XO0G(HG wCuw$Uoo4C98Zn15edB(u{fq=7{zJ|mHqRp~Qxr?T-2o}~boFyt=akR{00HYEH~;_u literal 0 HcmV?d00001 diff --git a/data/elementary/themes/img/bulb_over.png b/data/elementary/themes/img/bulb_over.png index eba13f1cb23bb1fc57241ffe9eac0d63e9232102..97d914e55f34f44468bf0d445c856a736367df04 100644 GIT binary patch delta 276 zcmaFC(aAhPMToP&BeIx*LAD))8T+4pOr7YaZp0|&>EaktG3V`_jfG5xBCdfaWd#Dn z7G^h|+2Y8p*VCXTr|B{yFzp`zp7;?cKOx&wsNmU+rS=l}oQHdVTgAgRbYLc@MA6DW3ZO(P~?U z*J=){SUjdOtQ1lRWm@9Z5W+b@i!n%*Xu++w7_6T&C-)p~IxhRaK<?CtYR3Qo literal 1128 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuB%fEX7WqAsj$Z!;#Vf4nJ zNUsNB#yF{oGC)De64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<{OpL)7D zhE&XXd&e+8I9!75!TX4PLfj(9R$Y)hV*fxrWYveJTf9c4D^6Wln!UU9m4o^&hUnWm zZc|U$zj(jGWgDMw;^Arj?e{KlcRns&*Wmo-`9vM-edgCDetNb0-0R6MKvxh2R(@qV z*L5@JTc}IT-TI%0YwZ4Sd}g68e1OS3|K1;+rC&aO*g5C(^L}~ze@mZOy!MUKf1u-` zdH1b+-NpND=W}h&RWU_8%c}pMUEkfY!_1=YZOh~E=3bT!KH`EGOJnDqf8PGLcskp0 zeOH$=&p#ht_xjU^YKyrH(=0nWBJ`$*o6Y_4=xBHU?{@$Due!Fi0L8g3KlN2#Hl^>J z-~lF}$qGtITcfVBe0Z>SU4}PD!p!A@>szwdI(o2fXkZXKVJY95`MCPP$&{j!KJNlX zMjeBhK7C9(3YnhG(f|HkEdeMJY{OW5E?h||Z1q$Iu^HRq4n!Kv^_#CJ*4^=6{XwEj z%$&1n;_S=+$_h>l`lX?iv@>QGi};7gf`z~k(NQ{A9$Q|xG2)M$p!uTzH*}TWxgU{_ zyr4+z=)N9>c_ zhC8Q?cHMtkWUln@O@8_B=Tk0B^*K|FbedYi7e!vuPK-UI4>##gd*d zr|ZH8oK#b{2<@83FzvPl6eR zB0X1fEl5OrPMDka!sCJmxRy@^I-rnc!?|0WD^O)#pUP1EQo$7QJ_4l2pW(IaZXTc> z;R992(PXsehJZ{HKH#MeGVLSFhI<=9ruj2y^PYM!-8RANrIX8%oyE^tHe9;)Kf8~e zU#@0W&@OpF`E7CDOZOL@i+}g_?c42fCvI=~DqN7C|9<)W@tx9{)mynf4!siMnV(CHyFYL+{< ZtDf<)cA(w?@tP`-jHj!g%Q~loCID_h@A?1$