billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=ab21ecaa6f1788d9e82cad5914c9c632f1ca844a
commit ab21ecaa6f1788d9e82cad5914c9c632f1ca844a Author: Boris Faure <[email protected]> Date: Sun Aug 2 23:20:12 2020 +0200 themes/default: finish color_classifying background --- data/themes/default/background.edc | 84 ++++++++++++++++++++++++++------------ data/themes/default/colors.edc | 6 +++ data/themes/nord.edc | 6 +++ data/themes/papercolor.edc | 8 ++++ data/themes/solarized.edc | 6 +++ data/themes/solarized_light.edc | 6 +++ 6 files changed, 89 insertions(+), 27 deletions(-) diff --git a/data/themes/default/background.edc b/data/themes/default/background.edc index 4722fe4..a2e270c 100644 --- a/data/themes/default/background.edc +++ b/data/themes/default/background.edc @@ -1191,11 +1191,13 @@ group { name: "terminology/background"; normal: "cr_glow.png"; border: 9 9 9 9; } - color: 51 153 255 32; + color: 255 255 255 32; + color_class: "GLOW"; } description { state: "over" 0.0; inherit: "default" 0.0; - color: 51 153 255 255; + color: 255 255 255 255; + color_class: "GLOW"; } } part { name: "tab_btn_glow_r1"; @@ -1210,11 +1212,13 @@ group { name: "terminology/background"; normal: "cr_glow.png"; border: 9 9 9 9; } - color: 51 153 255 32; + color: 255 255 255 32; + color_class: "GLOW"; } description { state: "over" 0.0; inherit: "default" 0.0; - color: 51 153 255 255; + color: 255 255 255 255; + color_class: "GLOW"; } } part { name: "tab_btn_glow_r2"; @@ -1229,11 +1233,13 @@ group { name: "terminology/background"; normal: "cr_glow.png"; border: 9 9 9 9; } - color: 51 153 255 32; + color: 255 255 255 32; + color_class: "GLOW"; } description { state: "over" 0.0; inherit: "default" 0.0; - color: 51 153 255 255; + color: 255 255 255 255; + color_class: "GLOW"; } } part { name: "tab_btn_glow_r3"; @@ -1248,11 +1254,13 @@ group { name: "terminology/background"; normal: "cr_glow.png"; border: 9 9 9 9; } - color: 51 153 255 32; + color: 255 255 255 32; + color_class: "GLOW"; } description { state: "over" 0.0; inherit: "default" 0.0; - color: 51 153 255 255; + color: 255 255 255 255; + color_class: "GLOW"; } } part { name: "tab_btn_r0"; type: RECT; @@ -1264,10 +1272,12 @@ group { name: "terminology/background"; rel1.relative: 0.05 0.05; rel2.relative: 0.45 0.45; color: 255 255 255 32; + color_class: "GLOW_HIGHLIGHT"; } description { state: "over" 0.0; inherit: "default" 0.0; color: 255 255 255 255; + color_class: "GLOW_HIGHLIGHT"; } } part { name: "tab_btn_r1"; type: RECT; @@ -1279,10 +1289,12 @@ group { name: "terminology/background"; rel1.relative: 0.55 0.05; rel2.relative: 0.95 0.45; color: 255 255 255 32; + color_class: "GLOW_HIGHLIGHT"; } description { state: "over" 0.0; inherit: "default" 0.0; color: 255 255 255 255; + color_class: "GLOW_HIGHLIGHT"; } } part { name: "tab_btn_r2"; type: RECT; @@ -1294,10 +1306,12 @@ group { name: "terminology/background"; rel1.relative: 0.05 0.55; rel2.relative: 0.45 0.95; color: 255 255 255 32; + color_class: "GLOW_HIGHLIGHT"; } description { state: "over" 0.0; inherit: "default" 0.0; color: 255 255 255 255; + color_class: "GLOW_HIGHLIGHT"; } } part { name: "tab_btn_r3"; type: RECT; @@ -1309,10 +1323,12 @@ group { name: "terminology/background"; rel1.relative: 0.55 0.55; rel2.relative: 0.95 0.95; color: 255 255 255 32; + color_class: "GLOW_HIGHLIGHT"; } description { state: "over" 0.0; inherit: "default" 0.0; color: 255 255 255 255; + color_class: "GLOW_HIGHLIGHT"; } } part { name: "terminology.tab_btn"; type: SWALLOW; @@ -1321,7 +1337,6 @@ group { name: "terminology/background"; description { state: "default" 0.0; rel1.relative: 1.0 0.0; rel2.to_y: "tabmiddle"; - color: 250 0 250 255; visible: 0; align: 1.0 0.0; fixed: 1 1; @@ -1554,7 +1569,8 @@ group { name: "terminology/background"; to_x: "tab_bevel_top2"; relative: 1.0 0.7; } - color: FG_COLOR; + color: 255 255 255 255; + color_class: "FG"; visible: 1; } } @@ -1597,8 +1613,10 @@ group { name: "terminology/background"; scale: 1; effect: SOFT_SHADOW BOTTOM; description { state: "default" 0.0; - color: FG_COLOR_NO_ALPHA 255; - color3: BG_COLOR_NO_ALPHA 18; + color: 255 255 255 255; + color2: 255 255 255 255; + color3: 255 255 255 18; + color_class: "TAB_TITLE"; text { font: "Sans:style=Bold"; size: 10; align: 0.5 0.5; min: 0 1; @@ -1625,8 +1643,6 @@ group { name: "terminology/background"; } description { state: "bell" 0.0; inherit: "tab" 0.0; - color: FG_COLOR_BELL_NO_ALPHA 255; - color3: BG_COLOR_BELL_NO_ALPHA 18; } } program { name: "tab,bell,on"; @@ -1655,7 +1671,8 @@ group { name: "terminology/background"; rel2.to_x: "terminology.tab"; rel2.to_y: "tabmiddle"; rel2.relative: 0.0 1.0; - color: 0 0 0 0; + color: 255 255 255 255; + color_class: "TAB_BG"; visible: 0; fixed: 1 1; } @@ -1672,7 +1689,8 @@ group { name: "terminology/background"; //rel2.to_x: "terminology.tab_btn"; rel2.to_y: "tabmiddle"; //rel2.relative: 0.0 1.0; - color: 0 0 0 0; + color: 255 255 255 255; + color_class: "TAB_BG"; visible: 0; fixed: 1 1; } @@ -1687,7 +1705,8 @@ group { name: "terminology/background"; rel2.to_x: "terminology.tab"; rel2.to_y: "tablimit0"; rel2.offset: -1 0; - color: 0 0 0 0; + color: 255 255 255 255; + color_class: "TAB_BG"; align: 0.0 0.0; visible: 0; fixed: 1 1; @@ -1720,12 +1739,14 @@ group { name: "terminology/background"; } description { state: "tab" 0.0; inherit: "default" 0.0; - color: FG_COLOR_NO_ALPHA 80; + color: 255 255 255 80; + color_class: "FG"; visible: 1; } description { state: "over" 0.0; inherit: "default" 0.0; - color: FG_COLOR_NO_ALPHA 255; + color: 255 255 255 255; + color_class: "FG"; visible: 1; } } @@ -1946,7 +1967,8 @@ group { name: "terminology/background"; description { state: "default" 0.0; \ rel1.to: "drag_"##DIR##"_outline"; \ rel2.to: "drag_"##DIR##"_outline"; \ - color: FG_COLOR_NO_ALPHA 40; \ + color: 255 255 255 40; \ + color_class: "FG"; \ visible: 0; \ } \ description { state: "hdrag,off" 0.0; \ @@ -1965,7 +1987,8 @@ group { name: "terminology/background"; normal: "cr_pulse.png"; \ border: 4 4 4 4; \ } \ - color: 51 153 255 0; \ + color: 255 255 255 0; \ + color_class: "GLOW"; \ visible: 0; \ } \ description { state: "hdrag,off" 0.0; \ @@ -1973,12 +1996,14 @@ group { name: "terminology/background"; } \ description { state: "on" 0.0; \ inherit: "default" 0.0; \ - color: 51 153 255 255; \ + color: 255 255 255 255; \ + color_class: "GLOW"; \ visible: 1; \ } \ description { state: "out" 0.0; \ inherit: "default" 0.0; \ - color: 51 153 255 0; \ + color: 255 255 255 0; \ + color_class: "GLOW"; \ rel1.offset: -8 -8; \ rel2.offset: 7 7; \ visible: 1; \ @@ -1995,7 +2020,8 @@ group { name: "terminology/background"; normal: "cr_glow.png"; \ border: 9 9 9 9; \ } \ - color: 51 153 255 40; \ + color: 255 255 255 40; \ + color_class: "GLOW"; \ visible: 0; \ } \ description { state: "hdrag,off" 0.0; \ @@ -2004,7 +2030,8 @@ group { name: "terminology/background"; } \ description { state: "active" 0.0; \ inherit: "default" 0.0; \ - color: 51 153 255 255; \ + color: 255 255 255 255; \ + color_class: "GLOW"; \ visible: 1; \ } \ } \ @@ -2019,7 +2046,8 @@ group { name: "terminology/background"; normal: "cr_out.png"; \ border: 3 3 3 3; \ } \ - color: 51 153 255 80; \ + color: 255 255 255 80; \ + color_class: "GLOW"; \ visible: 0; \ } \ description { state: "hdrag,off" 0.0; \ @@ -2029,6 +2057,7 @@ group { name: "terminology/background"; description { state: "active" 0.0; \ inherit: "default" 0.0; \ color: 255 255 255 255; \ + color_class: "GLOW_HIGHLIGHT"; \ visible: 1; \ } \ } \ @@ -2422,7 +2451,8 @@ group { name: "terminology/background"; mouse_events: 0; description { state: "default" 0.0; fixed: 1 1; - color: 51 153 255 255; + color: 255 255 255 255; + color_class: "GLOW"; rel1.to: "knob"; rel2.to: "knob"; image.normal: "media_busy_spinner.png"; diff --git a/data/themes/default/colors.edc b/data/themes/default/colors.edc index e2618ba..dd558a5 100644 --- a/data/themes/default/colors.edc +++ b/data/themes/default/colors.edc @@ -26,8 +26,14 @@ color_class { name: "TAB_MISSED_OVER"; color2: 51 153 255 255; color3: 51 153 255 255; } +color_class { name: "TAB_TITLE"; + color: FG_COLOR_NO_ALPHA 255; + color: 0 0 0 255; + color3: BG_COLOR_NO_ALPHA 255; +} color_class { name: "BG_SENDFILE"; color: 64 64 64 255; } color_class { name: "SHINE"; color: 255 255 255 255; } +color_class { name: "TAB_BG"; color: 31 31 31 255; } diff --git a/data/themes/nord.edc b/data/themes/nord.edc index b560698..ce230b1 100644 --- a/data/themes/nord.edc +++ b/data/themes/nord.edc @@ -74,8 +74,14 @@ color_classes { color2: 51 153 255 255; color3: 51 153 255 255; } + color_class { name: "TAB_TITLE"; + color: FG_COLOR_NO_ALPHA 255; + color: 0 0 0 255; + color3: BG_COLOR_NO_ALPHA 255; + } color_class { name: "BG_SENDFILE"; color: 64 64 64 255; } color_class { name: "SHINE"; color: 255 255 255 255; } + color_class { name: "TAB_BG"; color: 31 31 31 255; } color_class { name: "C0"; color: ANSI0; } // COL_BLACK diff --git a/data/themes/papercolor.edc b/data/themes/papercolor.edc index 4eea7c0..b392bf9 100644 --- a/data/themes/papercolor.edc +++ b/data/themes/papercolor.edc @@ -56,6 +56,14 @@ color_classes { color2: 51 153 255 255; color3: 51 153 255 255; } + color_class { name: "TAB_TITLE"; + color: FG_COLOR_NO_ALPHA 255; + color: 0 0 0 255; + color3: BG_COLOR_NO_ALPHA 255; + } + color_class { name: "BG_SENDFILE"; color: 64 64 64 255; } + color_class { name: "SHINE"; color: 255 255 255 255; } + color_class { name: "TAB_BG"; color: 31 31 31 255; } color_class { name: "C0"; color: ANSI7; } // COL_BLACK color_class { name: "C1"; color: ANSI1; } // COL_RED diff --git a/data/themes/solarized.edc b/data/themes/solarized.edc index 78cd004..67a264f 100644 --- a/data/themes/solarized.edc +++ b/data/themes/solarized.edc @@ -50,8 +50,14 @@ color_classes { color2: 51 153 255 255; color3: 51 153 255 255; } + color_class { name: "TAB_TITLE"; + color: FG_COLOR_NO_ALPHA 255; + color: 0 0 0 255; + color3: BG_COLOR_NO_ALPHA 255; + } color_class { name: "BG_SENDFILE"; color: 64 64 64 255; } color_class { name: "SHINE"; color: 255 255 255 255; } + color_class { name: "TAB_BG"; color: 31 31 31 255; } color_class { name: "c0"; color: S_base0; } diff --git a/data/themes/solarized_light.edc b/data/themes/solarized_light.edc index 7f6be70..683234b 100644 --- a/data/themes/solarized_light.edc +++ b/data/themes/solarized_light.edc @@ -50,8 +50,14 @@ color_classes { color2: 51 153 255 255; color3: 51 153 255 255; } + color_class { name: "TAB_TITLE"; + color: FG_COLOR_NO_ALPHA 255; + color: 0 0 0 255; + color3: BG_COLOR_NO_ALPHA 255; + } color_class { name: "BG_SENDFILE"; color: 64 64 64 255; } color_class { name: "SHINE"; color: 255 255 255 255; } + color_class { name: "TAB_BG"; color: 31 31 31 255; } color_class { name: "c0"; color: S_base0; } --
