raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=0b615a7acf88cb98a2ce06c9bf9fa9dd61a4b033
commit 0b615a7acf88cb98a2ce06c9bf9fa9dd61a4b033
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Sun Oct 13 21:55:50 2019 +0100
TH - actionslider
---
data/elementary/themes/edc/elm/actionslider.edc | 172 ++++++++----------------
1 file changed, 56 insertions(+), 116 deletions(-)
diff --git a/data/elementary/themes/edc/elm/actionslider.edc
b/data/elementary/themes/edc/elm/actionslider.edc
index 985fd640cb..c2ce9f0a80 100644
--- a/data/elementary/themes/edc/elm/actionslider.edc
+++ b/data/elementary/themes/edc/elm/actionslider.edc
@@ -6,104 +6,83 @@ group { name: "elm/actionslider/base/default";
images.image: "inset_shadow.png" COMP;
parts {
part { name: "bg"; type: RECT; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
- min: 48 10;
- color: DARK_GREY_BG_COLOR;
+ min: 120 20;
+ color: 0 0 0 64;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: DARK_GREY_BG_DISABLED_COLOR;
- }
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "bg";
- rel2.to: "bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
- part { name: "inset"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
+ color: 0 0 0 0;
}
}
part { name: "icon_dragable_area"; type: SPACER;
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
+ rel.to: "bg";
}
}
part { name: "elm.text.left"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
- color_class: "button_text";
+ color: 160 160 160 255;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
text { font: FN; size: 10;
- align: 0.05 0.5;
+ align: 0.0 0.5;
min: 1 1;
ellipsis: -1;
text_class: "button";
}
+ offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: FN_COL_DISABLE;
- color_class: "button_text_disabled";
+ color: 96 96 96 255;
}
}
part { name: "elm.text.center"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
- color_class: "check_off_text";
+ color: 160 160 160 255;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
text { font: FN; size: 10;
align: 0.5 0.5;
min: 1 1;
ellipsis: -1;
- text_class: "check_off_text";
+ text_class: "button";
}
+ offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: FN_COL_DISABLE;
- color_class: "button_text_disabled";
+ color: 96 96 96 255;
}
}
part { name: "elm.text.right"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
- color_class: "check_off_text";
+ color: 160 160 160 255;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
text { font: FN; size: 10;
- align: 0.95 0.5;
+ align: 1.0 0.5;
min: 1 1;
ellipsis: -1;
- text_class: "check_off_text";
+ text_class: "button";
}
+ offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: FN_COL_DISABLE;
- color_class: "button_text_disabled";
+ color: 96 96 96 255;
}
}
part { name: "elm.drag_button_base"; type: SWALLOW; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 40 10;
+ min: 40 20;
align: 0.5 0.5;
rel1.to: "icon_dragable_area";
rel2 {
@@ -120,7 +99,7 @@ group { name: "elm/actionslider/base/default";
part { name: "elm.drag_button"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- min: 40 10;
+ min: 40 20;
color: 0 0 0 0;
rel1.to_x: "elm.drag_button_base";
rel1.to_y: "icon_dragable_area";
@@ -131,57 +110,27 @@ group { name: "elm/actionslider/base/default";
events: "elm.drag_button_base";
}
}
- part { name: "glow_button"; mouse_events: 0;
+ part { name: "drag_button"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- rel1.offset: 0 -1;
- rel1.to: "drag_button";
- rel2.offset: -1 -2;
- rel2.to: "drag_button";
- image {
- normal: "glow_small.png";
- border: 7 7 7 7;
- middle: NONE;
- }
- fill.smooth: 0;
- visible: 0;
+ rel.to: "elm.drag_button";
+ color: 96 96 96 255;
}
- description { state: "clicked" 0.0;
+ description { state: "disabled" 0.0;
inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "drag_button"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "elm.drag_button";
- rel1.offset: -1 0;
- rel2.to: "elm.drag_button";
- rel2.offset: 0 0;
- image {
- normal: "button_normal.png";
- border: 4 4 3 5;
- middle: SOLID;
- }
+ color: 72 72 72 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- image.normal: "button_clicked.png";
- image.border: 5 5 4 6;
+ color: 51 153 255 255;
}
}
part { name: "elm.text.indicator"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
- rel1 {
- to: "elm.drag_button";
- offset: 5 2;
- }
- rel2 {
- to: "elm.drag_button";
- offset: -5 -3;
- }
- color: FN_COL_DEFAULT;
- color_class: "check_off_text";
+ rel.to: "drag_button";
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ color: 192 192 192 255;
text {
font: FN; size: 10;
align: 0.5 0.5;
@@ -191,12 +140,14 @@ group { name: "elm/actionslider/base/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: FN_COL_DISABLE;
- color_class: "button_text_disabled";
+ color: 96 96 96 255;
+ }
+ description { state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
}
}
- part { name: "disabler";
- type: RECT;
+ part { name: "disabler"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
visible: 0;
@@ -208,56 +159,50 @@ group { name: "elm/actionslider/base/default";
}
}
programs {
- program {
- signal: "mouse,up,1"; source: "elm.drag_button";
+ program { signal: "mouse,up,1"; source: "elm.drag_button";
action: SIGNAL_EMIT "elm,action,up,drag_button" "elm";
after: "button_unclick_anim";
}
program { name: "button_unclick_anim";
action: STATE_SET "default" 0.0;
target: "drag_button";
- target: "glow_button";
+ target: "elm.text.indicator";
}
- program {
- signal: "mouse,down,1*"; source: "elm.drag_button";
+ program { signal: "mouse,down,1*"; source: "elm.drag_button";
action: SIGNAL_EMIT "elm,action,down,drag_button" "elm";
after: "button_click_anim";
}
program { name: "button_click_anim";
action: STATE_SET "clicked" 0.0;
target: "drag_button";
- target: "glow_button";
+ target: "elm.text.indicator";
}
- program {
- signal: "mouse,move"; source: "elm.drag_button_base";
+ program { signal: "mouse,move"; source: "elm.drag_button_base";
action: SIGNAL_EMIT "elm,action,move,drag_button" "elm";
}
- program {
- signal: "mouse,down,1*"; source: "elm.text.right";
+ program { signal: "mouse,down,1*"; source: "elm.text.right";
action: SIGNAL_EMIT "elm,action,down,right" "elm";
}
- program {
- signal: "mouse,down,1*"; source: "elm.text.left";
+ program { signal: "mouse,down,1*"; source: "elm.text.left";
action: SIGNAL_EMIT "elm,action,down,left" "elm";
}
- program {
- signal: "mouse,down,1*"; source: "elm.text.center";
+ program { signal: "mouse,down,1*"; source: "elm.text.center";
action: SIGNAL_EMIT "elm,action,down,center" "elm";
}
- program {
- signal: "elm,state,disabled"; source: "elm";
+ program { signal: "elm,state,disabled"; source: "elm";
action: STATE_SET "disabled" 0.0;
target: "bg";
+ target: "drag_button";
target: "disabler";
target: "elm.text.left";
target: "elm.text.center";
target: "elm.text.right";
target: "elm.text.indicator";
}
- program {
- signal: "elm,state,enabled"; source: "elm";
+ program { signal: "elm,state,enabled"; source: "elm";
action: STATE_SET "default" 0.0;
target: "bg";
+ target: "drag_button";
target: "disabler";
target: "elm.text.left";
target: "elm.text.center";
@@ -271,21 +216,16 @@ group { name: "elm/actionslider/base/bar";
inherit: "elm/actionslider/base/default";
images.image: "horiz_glow_run_big.png" COMP;
parts {
- part { name: "bar"; mouse_events: 0;
+ part { name: "bar"; type: RECT; mouse_events: 0;
insert_before: "elm.drag_button_base";
description { state: "default" 0.0;
+ color: 51 153 255 128;
rel1.to: "bg";
- rel1.offset: 1 4;
rel2 {
relative: 0.0 1.0;
- offset: 3 -5;
to_x: "elm.drag_button_base";
to_y: "bg";
}
- image {
- normal: "horiz_glow_run_big.png";
- border: 0 4 0 0;
- }
}
}
}
--
