raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=5fba347e3dc6a9c76a9d5fc2082ed2499dbc68ef
commit 5fba347e3dc6a9c76a9d5fc2082ed2499dbc68ef
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Thu May 16 16:47:56 2019 +0100
TH - spinner
---
data/elementary/themes/edc/elm/button.edc | 129 +++++++++----------------
data/elementary/themes/edc/elm/spinner.edc | 148 +++++++++++------------------
2 files changed, 100 insertions(+), 177 deletions(-)
diff --git a/data/elementary/themes/edc/elm/button.edc
b/data/elementary/themes/edc/elm/button.edc
index c64e132b99..76ced7bd8d 100644
--- a/data/elementary/themes/edc/elm/button.edc
+++ b/data/elementary/themes/edc/elm/button.edc
@@ -1166,14 +1166,23 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
}
/******************* SPINNER BUTTONS STYLES **********************/
+#define IC(_NAME, _ICON) \
+set { name: _NAME; \
+ image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \
+ image {image: _ICON"-030.png" COMP; size: 16 16 30 30; } \
+ image {image: _ICON"-015.png" COMP; size: 0 0 15 15; } \
+}
+IC("ic-arrow-l", "arrow-l")
+IC("ic-arrow-r", "arrow-r")
+IC("ic-arrow-u", "arrow-u")
+IC("ic-arrow-d", "arrow-d")
+#undef IC
+
group { name: "elm/button/base/spinner/increase/default";
alias: "elm/button/base/spinner/increase/colorselector/default";
alias: "elm/button/base/spin_button/increase/default";
alias: "elm/button/base/calendar/increase/default";
alias: "elm/button/base/calendar/increase/double_spinners";
- images.image: "sym_right_light_normal.png" COMP;
- images.image: "sym_right_glow_normal.png" COMP;
- images.image: "sym_right_dark_normal.png" COMP;
script {
public mouse_down = 0;
public multi_down = 0;
@@ -1182,29 +1191,26 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
part { name: "arrow.image";
scale: 1;
description { state: "default" 0.0;
- min: 15 15;
- max: 15 15;
- color_class: "F032L1";
- image.normal: "sym_right_light_normal.png";
+ FIXED_SIZE(15, 15)
+ image.normal: "ic-arrow-r";
+ color: 160 160 160 255;
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_right_glow_normal.png";
+ color: 255 255 255 255;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_right_dark_normal.png";
+ color: 96 96 96 255;
}
}
- part { name: "over";
- type: RECT;
+ part { name: "over"; type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
color: 0 0 0 0;
}
}
- part { name: "disabler";
- type: RECT;
+ part { name: "disabler"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
visible: 0;
@@ -1217,8 +1223,7 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
}
programs {
program { name: "button_press";
- signal: "mouse,down,1";
- source: "over";
+ signal: "mouse,down,1"; source: "over";
script {
if ((get_int(multi_down) == 0) &&
(get_int(mouse_down) == 0)) {
@@ -1236,8 +1241,7 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
target: "arrow.image";
}
program { name: "button_unpress";
- signal: "mouse,up,1";
- source: "over";
+ signal: "mouse,up,1"; source: "over";
script {
if (get_int(mouse_down) == 1) {
set_int(mouse_down, 0);
@@ -1254,8 +1258,7 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
target: "arrow.image";
}
program { name: "button_click";
- signal: "mouse,clicked,1";
- source: "over";
+ signal: "mouse,clicked,1"; source: "over";
script {
if (get_int(multi_down) == 0) {
run_program(PROGRAM:"button_click2");
@@ -1263,21 +1266,18 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
}
}
program { name: "action_unpressed";
- signal: "elm,action,unpressed";
- source: "elm";
+ signal: "elm,action,unpressed"; source: "elm";
after: "button_unpress_anim";
}
program { name: "action_pressed";
- signal: "elm,action,pressed";
- source: "elm";
+ signal: "elm,action,pressed"; source: "elm";
after: "button_press_anim";
}
program { name: "button_click2";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
program { name: "access_pressed";
- signal: "elm,action,anim,activate";
- source: "elm";
+ signal: "elm,action,anim,activate"; source: "elm";
action: STATE_SET "pressed" 0.0;
target: "arrow.image";
after: "access_pressed_anim";
@@ -1288,31 +1288,25 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
target: "arrow.image";
}
program { name: "disable";
- signal: "elm,state,disabled";
- source: "elm";
+ signal: "elm,state,disabled"; source: "elm";
action: STATE_SET "disabled" 0.0;
target: "arrow.image";
target: "disabler";
}
program { name: "enable";
- signal: "elm,state,enabled";
- source: "elm";
+ signal: "elm,state,enabled"; source: "elm";
action: STATE_SET "default" 0.0;
target: "arrow.image";
target: "disabler";
}
- program {
- name: "multi_down";
- signal: "elm,action,multi,down";
- source: "elm";
+ program { name: "multi_down";
+ signal: "elm,action,multi,down"; source: "elm";
script {
set_int(multi_down, 1);
}
}
- program {
- name: "multi_up";
- signal: "elm,action,multi,up";
- source: "elm";
+ program { name: "multi_up";
+ signal: "elm,action,multi,up"; source: "elm";
script {
set_int(multi_down, 0);
}
@@ -1326,24 +1320,16 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
alias: "elm/button/base/spin_button/decrease/default";
alias: "elm/button/base/calendar/decrease/default";
alias: "elm/button/base/calendar/decrease/double_spinners";
- images.image: "sym_left_light_normal.png" COMP;
- images.image: "sym_left_glow_normal.png" COMP;
- images.image: "sym_left_dark_normal.png" COMP;
parts {
part { name: "arrow.image";
- scale: 1;
description { state: "default" 0.0;
- min: 15 15;
- max: 15 15;
- image.normal: "sym_left_light_normal.png";
+ image.normal: "ic-arrow-l";
}
description { state: "pressed" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_left_glow_normal.png";
+ image.normal: "ic-arrow-l";
}
description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_left_dark_normal.png";
+ image.normal: "ic-arrow-l";
}
}
}
@@ -1355,21 +1341,16 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
alias: "elm/button/base/spin_button/default";
alias: "elm/button/base/spin_button/vertical";
parts {
- part { name: "bg";
- type: SPACER;
+ part { name: "bg"; type: SPACER;
scale: 1;
description { state: "default" 0.0;
}
}
- part { name: "elm.text";
- type: TEXT;
+ part { name: "elm.text"; type: TEXT;
scale: 1;
- effect: SHADOW BOTTOM;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
- color_class: "spinner";
- rel1.to: "bg";
- rel2.to: "bg";
+ color: 160 160 160 255;
+ rel.to: "bg";
text { font: FN; size: 10;
min: 1 1;
text_class: "spinner";
@@ -1378,19 +1359,16 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0 ;
- color: FN_COL_DISABLE;
- color_class: "spinner_disabled";
+ color: 96 96 96 255;
}
}
- part { name: "over";
- type: RECT;
+ part { name: "over"; type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
color: 0 0 0 0;
}
}
- part { name: "disabler";
- type: RECT;
+ part { name: "disabler"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
visible: 0;
@@ -1431,24 +1409,16 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
group { name: "elm/button/base/spinner/increase/vertical";
inherit: "elm/button/base/spinner/increase/default";
alias: "elm/button/base/spin_button/increase/vertical";
- images.image: "sym_up_light_normal.png" COMP;
- images.image: "sym_up_glow_normal.png" COMP;
- images.image: "sym_up_dark_normal.png" COMP;
parts {
part { name: "arrow.image";
- scale: 1;
description { state: "default" 0.0;
- min: 15 15;
- max: 15 15;
- image.normal: "sym_up_light_normal.png";
+ image.normal: "ic-arrow-u";
}
description { state: "pressed" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_up_glow_normal.png";
+ image.normal: "ic-arrow-u";
}
description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_up_dark_normal.png";
+ image.normal: "ic-arrow-u";
}
}
}
@@ -1462,19 +1432,14 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
images.image: "sym_down_dark_normal.png" COMP;
parts {
part { name: "arrow.image";
- scale: 1;
description { state: "default" 0.0;
- min: 15 15;
- max: 15 15;
- image.normal: "sym_down_light_normal.png";
+ image.normal: "ic-arrow-d";
}
description { state: "pressed" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_down_glow_normal.png";
+ image.normal: "ic-arrow-d";
}
description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_down_dark_normal.png";
+ image.normal: "ic-arrow-d";
}
}
}
diff --git a/data/elementary/themes/edc/elm/spinner.edc
b/data/elementary/themes/edc/elm/spinner.edc
index 5148096897..63531e178f 100644
--- a/data/elementary/themes/edc/elm/spinner.edc
+++ b/data/elementary/themes/edc/elm/spinner.edc
@@ -1,38 +1,22 @@
group { name: "elm/spinner/base/default";
alias: "elm/spinner/base/colorselector/default";
- images.image: "vert_bar_inset.png" COMP;
parts {
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "elm.swallow.text_button";
- rel2.to: "elm.swallow.text_button";
+ rel.to: "elm.swallow.text_button";
}
}
- part { name: "bg";
- type: RECT;
+ part { name: "bg"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- color_class: "spinner_bg";
+ color: DARK_GREY_BG_COLOR;
}
}
- part { name: "inset"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.offset: 0 1;
- rel2.offset: -1 -2;
- image.normal: "vert_bar_inset.png";
- image.border: 1 1 8 6;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- part { name: "access";
- type: RECT;
+ part { name: "access"; type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
fixed: 1 1;
color: 0 0 0 0;
- rel1.to: "inset";
- rel2.to: "inset";
visible: 0;
}
description { state: "active" 0.0;
@@ -40,13 +24,11 @@ group { name: "elm/spinner/base/default";
visible: 1;
}
}
- part { name: "elm.swallow.entry";
- type: SWALLOW;
+ part { name: "elm.swallow.entry"; type: SWALLOW;
clip_to: "clip";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "elm.swallow.text_button";
- rel2.to: "elm.swallow.text_button";
+ rel.to: "elm.swallow.text_button";
visible: 0;
}
description { state: "active" 0.0;
@@ -54,49 +36,39 @@ group { name: "elm/spinner/base/default";
visible: 1;
}
}
- part { name: "elm.swallow.dec_button";
- type: SWALLOW;
+ part { name: "elm.swallow.dec_button"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
- fixed: 1 0;
- rel1.to: "inset";
- rel1.offset: 1 1;
- rel2.to: "inset";
- rel2.offset: 1 -2;
+ rel1.offset: 4 4;
+ rel2.offset: 4 -5;
rel2.relative: 0.0 1.0;
align: 0.0 0.5;
- min: 15 15;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
+ FIXED_SIZE(15, 15)
+ offscale;
}
}
- part { name: "elm.swallow.inc_button";
- type: SWALLOW;
+ part { name: "elm.swallow.inc_button"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
- fixed: 1 0;
- rel1.to: "inset";
- rel1.offset: 1 1;
+ rel1.offset: -5 4;
+ rel2.offset: -5 -5;
rel1.relative: 1.0 0.0;
- rel2.to: "inset";
- rel2.offset: 1 -2;
align: 1.0 0.5;
- min: 15 15;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
+ FIXED_SIZE(15, 15)
+ offscale;
}
}
- part { name: "elm.swallow.text_button";
- type: SWALLOW;
+ part { name: "elm.swallow.text_button"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
visible: 1;
- rel1.to_y: "inset";
rel1.to_x: "elm.swallow.dec_button";
rel1.relative: 1.0 0.0;
- rel1.offset: 1 1;
- rel2.to_y: "inset";
+ rel1.offset: 4 4;
rel2.to_x: "elm.swallow.inc_button";
rel2.relative: 0.0 1.0;
- rel2.offset: -2 -2;
+ rel2.offset: -5 -5;
+ offscale;
}
description { state: "inactive" 0.0;
inherit: "default" 0.0;
@@ -109,13 +81,11 @@ group { name: "elm/spinner/base/default";
dragable.y: 0 0 0;
description { state: "default" 0.0;
fixed: 1 0;
- rel1.to: "elm.swallow.text_button";
- rel2.to: "elm.swallow.text_button";
+ rel.to: "elm.swallow.text_button";
color: 0 0 0 0;
}
}
- part { name: "disabler";
- type: RECT;
+ part { name: "disabler"; type: RECT;
repeat_events: 0;
mouse_events: 0;
description { state: "default" 0.0;
@@ -130,50 +100,42 @@ group { name: "elm/spinner/base/default";
}
programs {
program { name: "entry_active";
- signal: "elm,state,entry,active";
- source: "elm";
+ signal: "elm,state,entry,active"; source: "elm";
action: STATE_SET "active" 0.0;
target: "elm.swallow.entry";
}
program { name: "entry_inactive";
- signal: "elm,state,entry,inactive";
- source: "elm";
+ signal: "elm,state,entry,inactive"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.entry";
}
program { name: "text_button_active";
- signal: "elm,state,button,active";
- source: "elm";
+ signal: "elm,state,button,active"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.text_button";
}
program { name: "text_button_inactive";
- signal: "elm,state,button,inactive";
- source: "elm";
+ signal: "elm,state,button,inactive"; source: "elm";
action: STATE_SET "inactive" 0.0;
target: "elm.swallow.text_button";
}
program { name: "access_activate";
- signal: "elm,state,access,active";
- source: "elm";
+ signal: "elm,state,access,active"; source: "elm";
action: STATE_SET "active" 0.0;
target: "access";
}
program { name: "access_inactivate";
- signal: "elm,state,access,inactive";
- source: "elm";
+ signal: "elm,state,access,inactive"; source: "elm";
action: STATE_SET "default" 0.0;
target: "access";
}
program { name: "disable";
- signal: "elm,state,disabled";
- source: "elm";
+ signal: "elm,state,disabled"; source: "elm";
action: STATE_SET "disabled" 0.0;
target: "disabler";
}
program { name: "enable";
- signal: "elm,state,enabled";
- source: "elm";
+ signal: "elm,state,enabled"; source: "elm";
action: STATE_SET "default" 0.0;
target: "disabler";
}
@@ -183,47 +145,44 @@ group { name: "elm/spinner/base/default";
group { name: "elm/spinner/base/vertical";
inherit: "elm/spinner/base/default";
parts {
- part { name: "elm.swallow.inc_button";
- type: SWALLOW;
+ part { name: "elm.swallow.inc_button"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
- rel1.to: "inset";
- rel1.offset: 1 1;
- rel1.relative: 1.0 0.0;
- rel2.to: "inset";
- rel2.offset: 1 -2;
- align: 1.0 0.5;
+ rel1.offset: 4 4;
+ rel2.offset: -5 4;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 0.0;
+ align: 0.5 0.0;
+ offscale;
}
}
- part { name: "elm.swallow.text_button";
- type: SWALLOW;
+ part { name: "elm.swallow.text_button"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
visible: 1;
- rel1.to_y: "inset";
- rel1.to_x: "elm.swallow.dec_button";
- rel1.relative: 1.0 0.0;
- rel1.offset: 1 1;
- rel2.to_y: "inset";
- rel2.to_x: "elm.swallow.inc_button";
- rel2.relative: 0.0 1.0;
- rel2.offset: -2 -2;
+ rel1.to_x: "bg";
+ rel1.to_y: "elm.swallow.inc_button";
+ rel1.relative: 0.0 1.0;
+ rel1.offset: 5 5;
+ rel2.to_x: "bg";
+ rel2.to_y: "elm.swallow.dec_button";
+ rel2.relative: 1.0 0.0;
+ rel2.offset: -5 -5;
+ offscale;
}
description { state: "active" 0.0;
inherit: "default" 0.0;
visible: 0;
}
}
- part { name: "elm.swallow.dec_button";
- type: SWALLOW;
+ part { name: "elm.swallow.dec_button"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
- rel1.to: "inset";
- rel1.offset: 1 1;
- rel2.to: "inset";
- rel2.offset: 1 -2;
+ rel1.offset: 4 -5;
+ rel2.offset: -5 -5;
rel2.relative: 0.0 1.0;
- align: 0.0 0.5;
+ rel2.relative: 1.0 1.0;
+ align: 0.5 1.0;
}
}
part { name: "elm.dragable.slider"; type: RECT;
@@ -232,8 +191,7 @@ group { name: "elm/spinner/base/vertical";
dragable.y: 1 1 0;
description { state: "default" 0.0;
fixed: 1 0;
- rel1.to: "elm.swallow.text_button";
- rel2.to: "elm.swallow.text_button";
+ rel.to: "elm.swallow.text_button";
color: 0 0 0 0;
}
}
--
