kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TH - buttons - go back to grey blue is just too much keep shadow

This commit is contained in:
Carsten Haitzler 2019-10-10 22:39:09 +01:00
parent efb8fbcaef
commit 5d79ef891f
4 changed files with 55 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
data/elementary/themes/edc/elm/button.edc
View File

@ -12,26 +12,33 @@ group { name: "elm/button/base/default";
rel.to: "base";
WIN_SHADOW_SMALL;
}
description { state: "pressed" 0.0;
inherit;
image.border_scale_by: 0.25;
rel1.offset: -5 -3;
rel2.offset: 4 6;
description { state: "pressed" 0.0; inherit;
image.border_scale_by: 0.1;
rel1.offset: -2 -1;
rel2.offset: 0 1;
}
description { state: "disabled" 0.0; inherit;
image.border_scale_by: 0.1;
rel1.offset: -2 -1;
rel2.offset: 0 1;
}
}
rect { "base";
scale: 1;
desc { "default";
color: 51 153 255 255;
color: 96 96 96 255;
rel1.offset: 2 2;
rel2.offset: -3 -3;
offscale;
}
desc { "pressed"; inherit;
color: 255 153 51 255;
color: 128 128 128 255;
rel1.offset: 3 3;
rel2.offset: -4 -4;
offscale;
}
desc { "disabled"; inherit;
color: 64 64 64 255;
color: 72 72 72 255;
}
desc { "hidden"; inherit;
visible: 0;
@ -63,10 +70,9 @@ group { name: "elm/button/base/default";
desc { "default";
fixed: 1 0;
align: 0.0 0.5;
rel.to: "base";
rel1.offset: 4 4;
rel1.offset: 6 6;
rel2.relative: 0.0 1.0;
rel2.offset: 4 -5;
rel2.offset: 6 -7;
visible: 0;
offscale;
}
@ -115,13 +121,11 @@ group { name: "elm/button/base/default";
scale: 1;
desc { "default";
fixed: 1 1;
color: 255 255 255 255;
rel1.offset: 0 4;
color: 192 192 192 255;
rel1.offset: 0 6;
rel1.relative: 1.0 0.0;
rel1.to_x: "elm.swallow.content";
rel1.to_y: "base";
rel2.to: "base";
rel2.offset: -5 -5;
rel2.offset: -7 -7;
text { font: FN; size: 10;
align: 0.5 0.5;
min: 0 0;
@ -131,7 +135,7 @@ group { name: "elm/button/base/default";
}
desc { "visible"; inherit;
fixed: 0 0;
rel1.offset: 4 4;
rel1.offset: 6 6;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
@ -139,7 +143,7 @@ group { name: "elm/button/base/default";
desc { "pressed_visible"; inherit;
fixed: 0 0;
color: 255 255 255 255;
rel1.offset: 4 4;
rel1.offset: 6 6;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
@ -160,7 +164,7 @@ group { name: "elm/button/base/default";
desc { "disabled_visible"; inherit;
fixed: 0 0;
color: 96 96 96 255;
rel1.offset: 4 4;
rel1.offset: 6 6;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;

16
data/elementary/themes/edc/elm/check.edc
View File

@ -4,6 +4,14 @@ group { name: "elm/check/base/default";
BUTTONMODE_SCRIPT
}
parts {
part { name: "shadow"; type: SPACER;
description { state: "default";
}
desc { "pressed"; inherit;
}
desc { "disabled"; inherit;
}
}
swallow { "elm.swallow.background"; nomouse;
desc { "default";
visible: 0;
@ -310,6 +318,14 @@ group { name: "elm/check/base/toggle";
BUTTONMODE_SCRIPT
}
parts {
part { name: "shadow"; type: SPACER;
description { state: "default";
}
desc { "pressed"; inherit;
}
desc { "disabled"; inherit;
}
}
swallow { "elm.swallow.background"; nomouse;
desc { "default";
visible: 0;

8
data/elementary/themes/edc/elm/radio.edc
View File

@ -4,6 +4,14 @@ group { name: "elm/radio/base/default";
BUTTONMODE_SCRIPT
}
parts {
part { name: "shadow"; type: SPACER;
description { state: "default";
}
desc { "pressed"; inherit;
}
desc { "disabled"; inherit;
}
}
swallow { "elm.swallow.background"; nomouse;
desc { "default";
visible: 0;

11
data/elementary/themes/macros.edc
View File

@ -195,12 +195,17 @@
} else { \
set_state(PART:"elm.swallow.background", "default", 0.0); \
if (!d) { \
if (!p) \
if (!p) { \
set_state(PART:"base", "default", 0.0); \
else \
set_state(PART:"shadow", "default", 0.0); \
} else { \
set_state(PART:"base", "pressed", 0.0); \
} else \
set_state(PART:"shadow", "pressed", 0.0); \
} \
} else { \
set_state(PART:"base", "disabled", 0.0); \
set_state(PART:"shadow", "disabled", 0.0); \
} \
} \
if (m1 == (ICON | LABEL)) { \
if (!d) { \