raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=181bae5598f05d35daa709ea2b5508a87b91b0b5
commit 181bae5598f05d35daa709ea2b5508a87b91b0b5
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Tue Feb 23 14:28:00 2021 +0000
TH - efl focus
---
data/elementary/themes/edc/efl/focus.edc | 143 ++++++++++++++++++++------
data/elementary/themes/edc/elm/colorclass.edc | 1 +
2 files changed, 110 insertions(+), 34 deletions(-)
diff --git a/data/elementary/themes/edc/efl/focus.edc
b/data/elementary/themes/edc/efl/focus.edc
index 32b5e6e564..d135632570 100644
--- a/data/elementary/themes/edc/efl/focus.edc
+++ b/data/elementary/themes/edc/efl/focus.edc
@@ -5,9 +5,8 @@ Group: efl/focus_highlight/top (@since 1.23)
Signal: efl,state,animating,stopped
Group: efl/focus_highlight/top:blank (@since 1.23)
*/
-group { name: "efl/focus_highlight/top"; data.item: "version" "123";
- images.image: "box_glow.png" COMP;
- images.image: "box_outline.png" COMP;
+group { name: "efl/focus_highlight/top";
+ data.item: "version" "123";
data.item: "animate" "on";
script {
public s_x, s_y, s_w, s_h; /* source */
@@ -34,14 +33,14 @@ group { name: "efl/focus_highlight/top"; data.item:
"version" "123";
public update_offset(x, y, w, h) {
set_state_val(PART:"base", STATE_REL1_OFFSET, x, y);
- set_state_val(PART:"base", STATE_REL2_OFFSET, x + w, y + h);
+ set_state_val(PART:"base", STATE_REL2_OFFSET, x + w - 1, y + h - 1);
}
public message(Msg_Type:type, id, ...) {
if ((type == MSG_INT_SET) && (id == 1)) {
new x1, y1, w1, h1, x2, y2, w2, h2;
new anim_id;
-
+
anim_id = get_int(g_anim_id);
if (anim_id != 0) {
cancel_anim(anim_id);
@@ -70,7 +69,7 @@ group { name: "efl/focus_highlight/top"; data.item: "version"
"123";
set_state_val(PART:"base", STATE_REL2, 0.0, 0.0);
update_offset(x1, y1, w1, h1);
set_state(PART:"base", "custom", 0.0);
-
+
anim_id = anim(0.2, "animator1", 1);
set_int(g_anim_id, anim_id);
}
@@ -84,38 +83,106 @@ group { name: "efl/focus_highlight/top"; data.item:
"version" "123";
}
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "glow";
- rel2.to: "glow";
+ rel.to: "base";
+ rel1.relative: -1.0 -1.0;
+ rel1.offset: -999 -999;
+ rel2.relative: 2.0 2.0;
+ rel2.offset: 999 999;
color: 255 255 255 0;
+ visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
+ visible: 1;
}
}
- part { name: "glow"; mouse_events: 0;
+ part { name: "top"; type: RECT;
clip_to: "clip";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "box_glow.png";
- image.border: 12 12 12 12;
- image.middle: 0;
- fill.smooth: 0;
- rel1.to: "base";
- rel1.offset: -7 -7;
- rel2.to: "base";
- rel2.offset: 5 5;
+ rel.to: "base";
+ color: 51 153 255 255;
+ rel2.relative: 1.0 0.0;
+ min: 4 4;
+ }
+ description { state: "hi" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
}
}
- part { name: "sel"; mouse_events: 0;
+ part { name: "topl"; type: RECT;
clip_to: "clip";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "box_outline.png";
- image.border: 12 12 12 12;
- image.middle: 0;
- fill.smooth: 0;
- rel1.to: "glow";
- rel2.to: "glow";
- color: 255 255 255 0;
+ rel.to: "top";
+ color: 51 153 255 255;
+ rel1.relative: 0.0 1.0;
+ rel2.relative: 0.0 1.0;
+ align: 0.0 0.0;
+ min: 4 4;
+ }
+ description { state: "hi" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
+ part { name: "topr"; type: RECT;
+ clip_to: "clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "top";
+ color: 51 153 255 255;
+ rel1.relative: 1.0 1.0;
+ rel2.relative: 1.0 1.0;
+ align: 1.0 0.0;
+ min: 4 4;
+ }
+ description { state: "hi" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
+ part { name: "bot"; type: RECT;
+ clip_to: "clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "base";
+ color: 51 153 255 255;
+ rel1.relative: 0.0 1.0;
+ min: 4 4;
+ }
+ description { state: "hi" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
+ part { name: "botl"; type: RECT;
+ clip_to: "clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "bot";
+ color: 51 153 255 255;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 0.0 0.0;
+ align: 0.0 1.0;
+ min: 4 4;
+ }
+ description { state: "hi" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
+ part { name: "botr"; type: RECT;
+ clip_to: "clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "bot";
+ color: 51 153 255 255;
+ rel1.relative: 1.0 0.0;
+ rel2.relative: 1.0 0.0;
+ align: 1.0 1.0;
+ min: 4 4;
}
description { state: "hi" 0.0;
inherit: "default" 0.0;
@@ -124,8 +191,7 @@ group { name: "efl/focus_highlight/top"; data.item:
"version" "123";
}
}
programs {
- program {
- signal: "efl,focus,visible,on"; source: "efl";
+ program { signal: "efl,focus,visible,on"; source: "efl";
action: ACTION_STOP;
target: "pulse";
target: "pulse2";
@@ -141,8 +207,7 @@ group { name: "efl/focus_highlight/top"; data.item:
"version" "123";
program { name: "go3";
action: SIGNAL_EMIT "efl,focus,visible,on,done" "efl";
}
- program {
- signal: "efl,focus,visible,off"; source: "efl";
+ program { signal: "efl,focus,visible,off"; source: "efl";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.4;
target: "clip";
@@ -161,24 +226,34 @@ group { name: "efl/focus_highlight/top"; data.item:
"version" "123";
action: STATE_SET "hi" 0.0;
transition: SINUSOIDAL 0.2;
in: 3.0 0.0;
- target: "sel";
+ target: "top";
+ target: "topl";
+ target: "topr";
+ target: "bot";
+ target: "botl";
+ target: "botr";
after: "pulse2";
}
program { name: "pulse2";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.4;
- target: "sel";
+ target: "top";
+ target: "topl";
+ target: "topr";
+ target: "bot";
+ target: "botl";
+ target: "botr";
after: "pulse";
}
- program {
- signal: "efl,state,animating,stopped"; source: "efl";
+ program { signal: "efl,state,animating,stopped"; source: "efl";
action: STATE_SET "default" 0.0;
target: "base";
}
}
}
-group { name: "efl/focus_highlight/top:blank"; data.item: "version" "123";
+group { name: "efl/focus_highlight/top:blank";
+ data.item: "version" "123";
parts {
}
}
diff --git a/data/elementary/themes/edc/elm/colorclass.edc
b/data/elementary/themes/edc/elm/colorclass.edc
index b6aff288b4..372a31673b 100644
--- a/data/elementary/themes/edc/elm/colorclass.edc
+++ b/data/elementary/themes/edc/elm/colorclass.edc
@@ -164,6 +164,7 @@ group { "elm/layout/colorclass/base"; program_source:
"elm"; nobroadcast;
}
group { "colorclass/colors"; program_source: "elm"; nobroadcast;
+ images.image: "box_glow.png" COMP;
parts {
group { "color1"; source: "colorclass/color1";
desc { min: 1 1; max: 1 1; hid;
--
