billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=2db4be56d10532261b02d59c3a98897c2c5f4b8a
commit 2db4be56d10532261b02d59c3a98897c2c5f4b8a Author: Boris Faure <bill...@gmail.com> Date: Tue Sep 24 22:27:23 2019 +0200 themes: make tab title readable based on theme default colors --- data/themes/default.edc | 15 +++++++++------ data/themes/nord.edc | 5 ++++- data/themes/papercolor.edc | 4 ++++ data/themes/solarized.edc | 4 ++++ data/themes/solarized_light.edc | 4 ++++ 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index 45d6082..bd30d2e 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -1,6 +1,9 @@ #ifndef NO_COLORS color_classes { -#define BG_COLOR 32 32 32 255 +#define BG_COLOR_NO_ALPHA 32 32 32 +#define BG_COLOR BG_COLOR_NO_ALPHA 255 +#define FG_COLOR_NO_ALPHA 170 170 170 +#define FG_COLOR FG_COLOR_NO_ALPHA 255 #include "default_colors.in.edc" } #endif @@ -1392,8 +1395,8 @@ collections { scale: 1; effect: SOFT_SHADOW BOTTOM; description { state: "default" 0.0; - color: 255 255 255 255; - color3: 0 0 0 18; + color: FG_COLOR_NO_ALPHA 255; + color3: BG_COLOR_NO_ALPHA 18; text { font: "Sans:style=Bold"; size: 10; align: 0.5 0.5; min: 0 1; @@ -2113,15 +2116,15 @@ collections { } part { name: "terminology.title"; type: TEXT; mouse_events: 0; scale: 1; - effect: SHADOW BOTTOM; + effect: GLOW; description { state: "default" 0.0; text { font: "Sans:style=Bold"; size: 10; align: 0.5 0.5; min: 0 1; } align: 0.5 0.5; - color: 0 0 0 255; - color3: 255 255 255 25; + color: 180 180 180 255; + color3: 0 0 0 18; rel1.to: "tab_bevel_top2"; rel2.to: "tab_bevel_top2"; } diff --git a/data/themes/nord.edc b/data/themes/nord.edc index b290b0a..6faaee0 100644 --- a/data/themes/nord.edc +++ b/data/themes/nord.edc @@ -39,7 +39,10 @@ #define ANSI15 nord6 #define COL_DEF nord4 -#define BG_COLOR nord0 +#define BG_COLOR_NO_ALPHA 46 52 64 +#define BG_COLOR BG_COLOR_NO_ALPHA 255 +#define FG_COLOR_NO_ALPHA 216 222 233 +#define FG_COLOR FG_COLOR_NO_ALPHA 255 #define NO_COLORS 1 color_classes { diff --git a/data/themes/papercolor.edc b/data/themes/papercolor.edc index ddda7c2..dcfd852 100644 --- a/data/themes/papercolor.edc +++ b/data/themes/papercolor.edc @@ -20,6 +20,10 @@ #define COL_DEF 68 68 68 255 /* #444444 */ #define BG_COLOR 238 238 238 255 /* #EEEEEE */ +#define BG_COLOR_NO_ALPHA 238 238 238 /* #EEEEEE */ +#define BG_COLOR BG_COLOR_NO_ALPHA 255 +#define FG_COLOR_NO_ALPHA 68 68 68 /* #444444 */ +#define FG_COLOR FG_COLOR_NO_ALPHA 255 #define NO_COLORS 1 color_classes { diff --git a/data/themes/solarized.edc b/data/themes/solarized.edc index 51aba64..b3bb28e 100644 --- a/data/themes/solarized.edc +++ b/data/themes/solarized.edc @@ -16,6 +16,10 @@ #define S_base3 253 246 227 255 #define BG_COLOR S_base03 +#define BG_COLOR_NO_ALPHA 0 43 54 +#define BG_COLOR BG_COLOR_NO_ALPHA 255 +#define FG_COLOR_NO_ALPHA 253 246 227 +#define FG_COLOR FG_COLOR_NO_ALPHA 255 #define NO_COLORS 1 color_classes { diff --git a/data/themes/solarized_light.edc b/data/themes/solarized_light.edc index 71fd1a4..c3db501 100644 --- a/data/themes/solarized_light.edc +++ b/data/themes/solarized_light.edc @@ -16,6 +16,10 @@ #define S_base3 0 43 54 255 #define BG_COLOR S_base03 +#define BG_COLOR_NO_ALPHA 253 246 227 +#define BG_COLOR BG_COLOR_NO_ALPHA 255 +#define FG_COLOR_NO_ALPHA 0 43 54 +#define FG_COLOR FG_COLOR_NO_ALPHA 255 #define NO_COLORS 1 color_classes { --