raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=cf836455e14621e1547f75ee9e614cf6e701ede3
commit cf836455e14621e1547f75ee9e614cf6e701ede3 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Mon Mar 26 20:25:43 2018 +0900 TH - remove left over blue glow on focus that isnt "flat" --- data/elementary/themes/edc/comp.edc | 35 +++---------------- data/elementary/themes/edc/comp_compat.edc | 25 +++----------- data/elementary/themes/edc/elm/ews.edc | 54 ------------------------------ 3 files changed, 8 insertions(+), 106 deletions(-) diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc index 80fc826996..4dfb6a2436 100644 --- a/data/elementary/themes/edc/comp.edc +++ b/data/elementary/themes/edc/comp.edc @@ -224,7 +224,6 @@ group { name: "e/comp/screen/overlay/noeffects"; } group { name: "e/comp/frame/default"; - images.image: "win_glow.png" COMP; images.image: "win_shadow.png" COMP; script { public message(Msg_Type:type, id, ...) { @@ -278,30 +277,6 @@ group { name: "e/comp/frame/default"; visible: 0; } } - rect { "focus_clip"; clip: "clipper"; - desc { - rel1.offset: -9999 -9999; - rel2.offset: 9999 9999; - } - desc { "hid"; hid; } - } - part { name: "glow"; mouse_events: 0; - clip_to: "focus_clip"; - description { state: "default" 0.0; - image.normal: "win_glow.png"; - image.border: 9 9 9 9; - image.middle: 0; - rel.to: "gspacer"; - fill.smooth: 0; - color: 255 255 255 0; - visible: 0; - } - description { state: "focused" 0.0; - inherit; - color: 255 255 255 255; - visible: 1; - } - } part { name: "shower"; type: SPACER; description { state: "default" 0.0; rel1.relative: 0.05 0.05; @@ -381,6 +356,7 @@ group { name: "e/comp/frame/default"; action: SIGNAL_EMIT "e,action,hide,done" "e"; } } +/* program { name: "focus_on"; signal: "e,state,focused"; source: "e"; @@ -430,6 +406,7 @@ group { name: "e/comp/frame/default"; action: STATE_SET "default"; target: "focus_clip"; } + */ } } @@ -546,6 +523,7 @@ group { name: "e/comp/frame/default/fast"; name: "visible_off"; transition: DECELERATE 0; } +/* program { name: "focus_on"; signal: "e,state,focus,on"; source: "e"; @@ -562,6 +540,7 @@ group { name: "e/comp/frame/default/fast"; name: "focus_off"; transition: SINUSOIDAL 0; } + */ } } @@ -635,9 +614,6 @@ group { name: "e/comp/frame/menu"; rel2.relative: 0.95 0.9; } } - image { "glow"; - desc { "focused"; hid; } - } } } @@ -650,9 +626,6 @@ group { name: "e/comp/frame/menu/fast"; rel2.relative: 0.95 0.9; } } - image { "glow"; - desc { "focused"; hid; } - } } } diff --git a/data/elementary/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc index e5a0f0a0be..7d361f8382 100644 --- a/data/elementary/themes/edc/comp_compat.edc +++ b/data/elementary/themes/edc/comp_compat.edc @@ -1,6 +1,5 @@ group { name: "e/comp/border/default"; images.image: "win_shadow.png" COMP; - images.image: "win_glow.png" COMP; parts { part { name: "clipper"; type: RECT; description { state: "default" 0.0; @@ -29,26 +28,6 @@ group { name: "e/comp/border/default"; visible: 0; } } - part { name: "glow"; mouse_events: 0; - clip_to: "clipper"; - description { state: "default" 0.0; - image.normal: "win_glow.png"; - image.border: 9 9 9 9; - image.middle: 0; - rel1.to: "e.swallow.content"; - rel1.offset: -5 -5; - rel2.to: "e.swallow.content"; - rel2.offset: 4 4; - fill.smooth: 0; - color: 255 255 255 0; - visible: 0; - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - visible: 1; - } - } part { name: "shower"; type: SPACER; description { state: "default" 0.0; rel1.relative: 0.05 0.05; @@ -128,6 +107,7 @@ group { name: "e/comp/border/default"; program { name: "hide2"; action: SIGNAL_EMIT "e,action,hide,done" "e"; } +/* program { name: "focus_on"; signal: "e,state,focus,on"; source: "e"; @@ -175,6 +155,7 @@ group { name: "e/comp/border/default"; transition: SINUSOIDAL 0.6 CURRENT; target: "glow"; } + */ } } @@ -290,6 +271,7 @@ group { name: "e/comp/border/default/fast"; name: "visible_off"; transition: DECELERATE 0; } +/* program { name: "focus_on"; signal: "e,state,focus,on"; source: "e"; @@ -308,6 +290,7 @@ group { name: "e/comp/border/default/fast"; name: "focus_off"; transition: SINUSOIDAL 0; } + */ } } diff --git a/data/elementary/themes/edc/elm/ews.edc b/data/elementary/themes/edc/elm/ews.edc index 4d7d14b970..d5837317c0 100644 --- a/data/elementary/themes/edc/elm/ews.edc +++ b/data/elementary/themes/edc/elm/ews.edc @@ -1,6 +1,5 @@ group { name: "elm/ews/decoration/default"; images.image: "win_shadow.png" COMP; - images.image: "win_glow.png" COMP; images.image: "vgrad_med_lighter.png" COMP; images.image: "vgrad_med_dark.png" COMP; images.image: "bevel_out.png" COMP; @@ -32,25 +31,6 @@ group { name: "elm/ews/decoration/default"; visible: 0; } } - part { name: "glow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "win_glow.png"; - image.border: 9 9 9 9; - image.middle: 0; - rel1.offset: -5 -5; - rel1.to: "top"; - rel2.offset: 4 4; - rel2.to: "bottom"; - fill.smooth: 0; - color: 255 255 255 0; - visible: 0; - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - visible: 1; - } - } part { name: "top"; description { state: "default" 0.0; color_class: "border_top"; @@ -537,21 +517,13 @@ group { name: "elm/ews/decoration/default"; signal: "elm,state,focus,on"; source: "elm"; action: STATE_SET "focused" 0.0; transition: SINUSOIDAL 0.1; - target: "glow"; target: "focus"; - after: "focus2"; - } - program { name: "focus2"; - action: STATE_SET "default" 0.0; - transition: SINUSOIDAL 0.4; - target: "glow"; } program { signal: "elm,state,focus,off"; source: "elm"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 0.1; target: "focus"; - target: "glow"; } program { signal: "elm,state,focus,on"; source: "elm"; @@ -635,7 +607,6 @@ group { name: "elm/ews/decoration/default"; group { name: "elm/ews/decoration/borderless"; images.image: "win_shadow.png" COMP; - images.image: "win_glow.png" COMP; parts { part { name: "shadow"; mouse_events: 0; description { state: "default" 0.0; @@ -646,23 +617,6 @@ group { name: "elm/ews/decoration/borderless"; visible: 0; } } - part { name: "glow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "win_glow.png"; - image.border: 9 9 9 9; - image.middle: 0; - rel1.offset: -5 -5; - rel2.offset: 4 4; - fill.smooth: 0; - color: 255 255 255 0; - visible: 0; - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - visible: 1; - } - } part { name: "focus"; type: RECT; repeat_events: 1; description { state: "default" 0.0; color: 0 0 0 0; @@ -680,21 +634,13 @@ group { name: "elm/ews/decoration/borderless"; signal: "elm,state,focus,on"; source: "elm"; action: STATE_SET "focused" 0.0; transition: SINUSOIDAL 0.1; - target: "glow"; target: "focus"; - after: "focus2"; - } - program { name: "focus2"; - action: STATE_SET "default" 0.0; - transition: SINUSOIDAL 0.4; - target: "glow"; } program { signal: "elm,state,focus,off"; source: "elm"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 0.1; target: "focus"; - target: "glow"; } } } --
