From 82dec43611be11f2762120fb47d9a1671c910b3b Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Sun, 26 May 2019 22:54:12 +0200 Subject: [PATCH] themes: use a color_class BG to set background color --- ChangeLog.theme | 6 +++++- data/themes/base16_ocean_dark.edc | 1 + data/themes/default.edc | 10 +++++----- data/themes/default_colors.in.edc | 3 ++- data/themes/mild.edc | 4 ++-- data/themes/mustang.edc | 2 ++ data/themes/nord.edc | 4 +++- data/themes/smyck.edc | 2 ++ data/themes/solarized.edc | 21 ++++++++++++--------- data/themes/solarized_light.edc | 4 +++- 10 files changed, 37 insertions(+), 20 deletions(-) diff --git a/ChangeLog.theme b/ChangeLog.theme index d886cb3b..7a18ef4c 100644 --- a/ChangeLog.theme +++ b/ChangeLog.theme @@ -1,7 +1,11 @@ ================= -Terminology 1.2.0 +Terminology 1.5.0 ================= +Changes since 1.2.0: +-------------------- + * Color class "BG" has to be set with the color of the background. + Changes since 1.1.1: -------------------- diff --git a/data/themes/base16_ocean_dark.edc b/data/themes/base16_ocean_dark.edc index 124a0ac9..843fc5a7 100644 --- a/data/themes/base16_ocean_dark.edc +++ b/data/themes/base16_ocean_dark.edc @@ -25,6 +25,7 @@ collections { color_class { name: "C7"; color: 192 197 206 255; } color_class { name: "C8"; color: 101 115 126 255; } color_class { name: "C9"; color: 208 135 112 255; } + color_class { name: "BG"; color: BG_COLOR; } } } diff --git a/data/themes/default.edc b/data/themes/default.edc index 93232552..45d6082b 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -1,7 +1,7 @@ #ifndef NO_COLORS color_classes { -# include "default_colors.in.edc" -# define BG_COL 32 32 32 255 +#define BG_COLOR 32 32 32 255 +#include "default_colors.in.edc" } #endif @@ -54,7 +54,7 @@ collections { part { name: "miniview.bg"; type: RECT; //mouse_events: 1; description { state: "default" 0.0; - color: BG_COL; + color_class: "BG"; } } part { name: "shadow"; @@ -326,7 +326,7 @@ collections { part { name: "base"; type: RECT; mouse_events: 1; description { state: "default" 0.0; - color: BG_COL; + color_class: "BG"; } } @@ -5153,7 +5153,7 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: part { name: "base"; type: RECT; mouse_events: 1; description { state: "default" 0.0; - color: BG_COL; + color_class: "BG"; rel1.offset: 2 2; rel2.offset: -3 -3; } diff --git a/data/themes/default_colors.in.edc b/data/themes/default_colors.in.edc index aa68f4bc..415460fd 100644 --- a/data/themes/default_colors.in.edc +++ b/data/themes/default_colors.in.edc @@ -1,3 +1,5 @@ +color_class { name: "BG"; color: BG_COLOR ; } + color_class { name: "c0"; color: 170 170 170 255; } // COL_DEF color_class { name: "c1"; color: 0 0 0 255; } // COL_BLACK color_class { name: "c2"; color: 204 51 51 255; } // COL_RED @@ -347,5 +349,4 @@ color_class { name: "C252"; color: 210 210 210 255; } color_class { name: "C253"; color: 218 218 218 255; } color_class { name: "C254"; color: 228 228 228 255; } color_class { name: "C255"; color: 238 238 238 255; } - #endif diff --git a/data/themes/mild.edc b/data/themes/mild.edc index a75cba03..f8a79d0d 100644 --- a/data/themes/mild.edc +++ b/data/themes/mild.edc @@ -129,7 +129,7 @@ collections { mouse_events: 1; clip_to: "baseclip"; description { state: "default" 0.0; - color: BG_COLOR; + color_class: "BG"; } } part { name: "fade"; type: RECT; @@ -1820,7 +1820,7 @@ collections { part { name: "base"; type: RECT; clip_to: "clip"; description { state: "default" 0.0; - color: BG_COLOR; + color_class: "BG"; rel1.to: "terminology.content"; rel2.to: "terminology.content"; } diff --git a/data/themes/mustang.edc b/data/themes/mustang.edc index b81656e2..2176c6b7 100644 --- a/data/themes/mustang.edc +++ b/data/themes/mustang.edc @@ -22,6 +22,8 @@ collections { color_class { name: "C13"; color: 245 121 0 255; } color_class { name: "C14"; color: 70 164 255 255; } color_class { name: "C15"; color: 255 255 255 255; } + + color_class { name: "BG"; color: BG_COLOR; } } } diff --git a/data/themes/nord.edc b/data/themes/nord.edc index 7aa74ee1..b290b0a7 100644 --- a/data/themes/nord.edc +++ b/data/themes/nord.edc @@ -39,7 +39,7 @@ #define ANSI15 nord6 #define COL_DEF nord4 -#define BG_COL nord0 +#define BG_COLOR nord0 #define NO_COLORS 1 color_classes { @@ -100,5 +100,7 @@ color_classes { color_class { name: "c42"; color: ANSI13; } color_class { name: "c43"; color: ANSI14; } color_class { name: "c44"; color: ANSI15; } + + color_class { name: "BG"; color: BG_COLOR; } } #include "default.edc" diff --git a/data/themes/smyck.edc b/data/themes/smyck.edc index 8ac1535f..b3655017 100644 --- a/data/themes/smyck.edc +++ b/data/themes/smyck.edc @@ -79,6 +79,8 @@ color_classes { color_class { name: "c42"; color: ANSI13; } color_class { name: "c43"; color: ANSI14; } color_class { name: "c44"; color: ANSI15; } + + color_class { name: "BG"; color: BG_COLOR; } } #define INHERIT_PROVIDE_OWN_COLORS diff --git a/data/themes/solarized.edc b/data/themes/solarized.edc index c344c6c9..51aba64e 100644 --- a/data/themes/solarized.edc +++ b/data/themes/solarized.edc @@ -6,16 +6,16 @@ #define S_blue 38 139 210 255 #define S_cyan 42 161 152 255 #define S_green 133 153 0 255 -#define S_base03 0 43 54 255 -#define S_base02 7 54 66 255 -#define S_base01 88 110 117 255 -#define S_base00 101 123 131 255 -#define S_base0 131 148 150 255 -#define S_base1 147 161 161 255 -#define S_base2 238 232 213 255 -#define S_base3 253 246 227 255 +#define S_base03 0 43 54 255 +#define S_base02 7 54 66 255 +#define S_base01 88 110 117 255 +#define S_base00 101 123 131 255 +#define S_base0 131 148 150 255 +#define S_base1 147 161 161 255 +#define S_base2 238 232 213 255 +#define S_base3 253 246 227 255 -#define BG_COL S_base03 +#define BG_COLOR S_base03 #define NO_COLORS 1 color_classes { @@ -82,5 +82,8 @@ color_classes { color_class { name: "C13"; color: S_violet; } // COL_MAGENTA color_class { name: "C14"; color: S_base1; } // COL_CYAN color_class { name: "C15"; color: S_base3; } // COL_WHITE + + color_class { name: "BG"; color: BG_COLOR; } + } #include "default.edc" diff --git a/data/themes/solarized_light.edc b/data/themes/solarized_light.edc index b68e938f..71fd1a45 100644 --- a/data/themes/solarized_light.edc +++ b/data/themes/solarized_light.edc @@ -15,7 +15,7 @@ #define S_base2 7 54 66 255 #define S_base3 0 43 54 255 -#define BG_COL S_base03 +#define BG_COLOR S_base03 #define NO_COLORS 1 color_classes { @@ -73,5 +73,7 @@ color_classes { color_class { name: "C13"; color: S_violet; } // COL_MAGENTA color_class { name: "C14"; color: S_base1; } // COL_CYAN color_class { name: "C15"; color: S_base3; } // COL_WHITE + + color_class { name: "BG"; color: BG_COLOR; } } #include "default.edc"