raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=c3591e56d81ab653b6c7fa17e003766b7f692b98
commit c3591e56d81ab653b6c7fa17e003766b7f692b98 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sat Aug 10 01:08:15 2019 +0100 TH - e about - make more consistent with the flat look --- data/elementary/themes/edc/about-e.edc | 86 +++++++++++++++++++++---- data/elementary/themes/img/about-lines.png | Bin 0 -> 132 bytes data/elementary/themes/img/about-triangles.png | Bin 0 -> 3998 bytes 3 files changed, 73 insertions(+), 13 deletions(-) diff --git a/data/elementary/themes/edc/about-e.edc b/data/elementary/themes/edc/about-e.edc index ddef15ae78..117e874214 100644 --- a/data/elementary/themes/edc/about-e.edc +++ b/data/elementary/themes/edc/about-e.edc @@ -1,8 +1,10 @@ group { name: "e/widgets/about/main"; // data.item: "borderless" "1"; // data.item: "shaped" "1"; - images.image: "snow.jpg" LOSSY 90; - images.image: "grad-v-light.png" COMP; + images.image: "about-lines.png" COMP; + images.image: "about-triangles.png" COMP; + images.image: "win_shadow.png" COMP; +// images.image: "snow.jpg" LOSSY 90; set { name: "logo_mono"; image { image: "logo.png" COMP; size: 601 601 99999 99999; } image { image: "logo2.png" COMP; size: 301 301 600 600; } @@ -26,14 +28,15 @@ group { name: "e/widgets/about/main"; tag: "br" "\n"; } } - min: 320 360; + min: 320 420; parts { part { name: "sizer"; type: SPACER; scale: 1; description { state: "default" 0.0; - min: 320 360; + min: 320 420; } } +/* part { name: "image"; description { state: "default" 0.0; fixed: 1 1; @@ -41,6 +44,13 @@ group { name: "e/widgets/about/main"; aspect: 1.0 1.0; aspect_preference: NONE; } } + */ + part { name: "image"; type: RECT; + description { state: "default" 0.0; + fixed: 1 1; + color: 48 48 48 255; + } + } //////////////////////////////////////////////////////////////// part { name: "e.textblock.authors"; type: TEXTBLOCK; mouse_events: 0; scale: 1; @@ -118,17 +128,20 @@ group { name: "e/widgets/about/main"; after: "show3"; } //////////////////////////////////////////////////////////////// - part { name: "shad"; + part { name: "lines"; scale: 1; description { state: "default" 0.0; - image.normal: "grad-v-light.png"; - min: 0 256; + image.normal: "about-lines.png"; + min: 0 128; align: 0.5 0.0; rel1.relative: 0.0 0.0; rel2.relative: 1.0 0.0; - fill.size.relative: 0.0 1.0; - fill.size.offset: 64 0; - fill.smooth: 0; + fill.smooth: 1; + color: 64 64 64 255; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 32 32 32 255; } } //////////////////////////////////////////////////////////////// @@ -183,17 +196,52 @@ group { name: "e/widgets/about/main"; } } //////////////////////////////////////////////////////////////// +#define TRI(_name, _size, _align) \ + part { name: _name; \ + scale: 1; \ + description { state: "default" 0.0; \ + max: _size (_size*180/255); \ + align: _align 1.0; \ + image.normal: "about-triangles.png"; \ + aspect: (255/180) (255/180); aspect_preference: HORIZONTAL; \ + rel1.relative: 0.0 1.0; \ + color: 64 64 64 255; \ + } \ + } + TRI("t1", 127, 0.5) + TRI("t2", 83, 0.2) + TRI("t3", 163, 0.9) + TRI("t4", 47, 1.0) + TRI("t5", 63, 0.0) + TRI("t6", 99, 0.3) + TRI("t7", 199, 0.7) + TRI("t8", 141, 0.1) + TRI("t9", 75, 0.6) + //////////////////////////////////////////////////////////////// + part { name: "shadow"; mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel.to: "base"; + WIN_SHADOW_SMALL; + } + description { state: "clicked" 0.0; + inherit; + image.border_scale_by: 0.25; + rel1.offset: -5 -3; + rel2.offset: 4 6; + } + } part { name: "base"; type: RECT; description { state: "default" 0.0; rel1.offset: -6 -6; rel1.to: "e.text.label"; rel2.offset: 5 5; rel2.to: "e.text.label"; - color: 48 48 48 255; + color: 51 153 255 255; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 32 32 32 255; + color: 255 153 51 255; } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; @@ -203,7 +251,7 @@ group { name: "e/widgets/about/main"; rel1.relative: 0.5 1.0; rel2.offset: -1 -19; rel2.relative: 0.5 1.0; - color: 160 160 160 255; + color: 255 255 255 255; align: 0.5 1.0; min: 80 10; text { font: FN; size: 10; @@ -221,15 +269,27 @@ group { name: "e/widgets/about/main"; signal: "mouse,down,1*"; source: "base"; action: STATE_SET "clicked" 0.0; target: "base"; + target: "shadow"; } program { signal: "mouse,up,1"; source: "base"; action: STATE_SET "default" 0.0; target: "base"; + target: "shadow"; } program { signal: "mouse,clicked,1*"; source: "base"; action: SIGNAL_EMIT "e,action,close" ""; } + program { + signal: "e,state,focused"; source: "e"; + action: STATE_SET "focused" 0.0; + target: "lines"; + } + program { + signal: "e,state,unfocused"; source: "e"; + action: STATE_SET "default" 0.0; + target: "lines"; + } } } diff --git a/data/elementary/themes/img/about-lines.png b/data/elementary/themes/img/about-lines.png new file mode 100644 index 0000000000..6af67e4426 Binary files /dev/null and b/data/elementary/themes/img/about-lines.png differ diff --git a/data/elementary/themes/img/about-triangles.png b/data/elementary/themes/img/about-triangles.png new file mode 100644 index 0000000000..cb29d6c16e Binary files /dev/null and b/data/elementary/themes/img/about-triangles.png differ --
