raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=5999b5d4b5dadbd2ed65ac328e3a88c30306d1a4
commit 5999b5d4b5dadbd2ed65ac328e3a88c30306d1a4 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Wed Dec 5 14:28:53 2018 +0000 TH - conf --- data/elementary/themes/edc/conf.edc | 70 +++++++++------------------------ data/elementary/themes/img/spanner.png | Bin 0 -> 4960 bytes 2 files changed, 18 insertions(+), 52 deletions(-) diff --git a/data/elementary/themes/edc/conf.edc b/data/elementary/themes/edc/conf.edc index 4bb007f5d1..e93b66b0c6 100644 --- a/data/elementary/themes/edc/conf.edc +++ b/data/elementary/themes/edc/conf.edc @@ -21,10 +21,10 @@ group { name: "e/widgets/configure/main"; } part { name: "e.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1.offset: 8 8; + rel1.offset: 0 8; rel1.to_x: "base"; rel2.relative: 1.0 0.0; - rel2.offset: -9 -17; + rel2.offset: -1 -17; rel2.to_y: "e.swallow.button"; } } @@ -42,61 +42,36 @@ group { name: "e/widgets/configure/main"; } group { name: "e/modules/conf/main"; - images.image: "button_normal.png" COMP; - images.image: "button_clicked.png" COMP; - images.image: "spanner_inset.png" COMP; - images.image: "spanner_hilight.png" COMP; - images.image: "spanner_glow.png" COMP; + images.image: "spanner.png" COMP; min: 16 16; - max: 80 80; parts { - part { name: "base"; + part { name: "base"; type: RECT; + scale: 1; description { state: "default" 0.0; - image.normal: "button_normal.png"; - image.border: 4 4 3 5; - image.middle: SOLID; - rel1.offset: -1 0; - rel2.offset: 0 1; - fill.smooth: 0; + color: 80 80 80 255; + rel1.offset: 2 2; + rel2.offset: -3 -3; + offscale; } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "button_clicked.png"; - image.border: 5 5 4 6; - } - } - part { name: "spanner_hilight"; mouse_events: 0; - description { state: "default" 0.0; - aspect: 1.0 1.0; aspect_preference: BOTH; - max: 80 80; - rel1.offset: 0 1; - rel1.to: "spanner"; - rel2.offset: -1 0; - rel2.to: "spanner"; - image.normal: "spanner_hilight.png"; + color: 40 40 40 255; } } part { name: "spanner"; mouse_events: 0; + scale: 1; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; - max: 80 80; + rel.to: "base"; rel1.offset: 4 4; rel2.offset: -5 -5; - image.normal: "spanner_inset.png"; - } - } - part { name: "spanner_glow"; mouse_events: 0; - description { state: "default" 0.0; - aspect: 1.0 1.0; aspect_preference: BOTH; - max: 80 80; - rel1.to: "spanner"; - rel2.to: "spanner"; - image.normal: "spanner_glow.png"; - visible: 0; + image.normal: "spanner.png"; + offscale; + color: 160 160 160 255; } description { state: "clicked" 0.0; inherit: "default" 0.0; - visible: 1; + color: 255 255 255 255; } } } @@ -105,26 +80,17 @@ group { name: "e/modules/conf/main"; signal: "mouse,down,1"; source: "base"; action: STATE_SET "clicked" 0.0; target: "base"; + target: "spanner"; } program { signal: "mouse,up,1"; source: "base"; action: STATE_SET "default" 0.0; target: "base"; - target: "spanner_glow"; + target: "spanner"; } program { signal: "mouse,clicked,1*"; source: "base"; action: SIGNAL_EMIT "e,action,conf" ""; } - program { - signal: "mouse,in"; source: "base"; - action: STATE_SET "clicked" 0.0; - target: "spanner_glow"; - } - program { - signal: "mouse,out"; source: "base"; - action: STATE_SET "default" 0.0; - target: "spanner_glow"; - } } } diff --git a/data/elementary/themes/img/spanner.png b/data/elementary/themes/img/spanner.png new file mode 100644 index 0000000000..0b90edb215 Binary files /dev/null and b/data/elementary/themes/img/spanner.png differ --
