raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=05bee4b2abcf321a8c9c67d953159d94cd40285b
commit 05bee4b2abcf321a8c9c67d953159d94cd40285b Author: Carsten Haitzler <[email protected]> Date: Mon Oct 18 18:50:08 2021 +0100 elm theme - final cc work for elm code cc's --- data/elementary/themes/colorclasses.edc | 111 ++++++++++++++++++-------------- src/lib/elementary/elm_code_widget.c | 66 +++++++++---------- 2 files changed, 97 insertions(+), 80 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index 47b1860fdb..a7f1986928 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -380,19 +380,26 @@ color_classes { /////////////////////////////////////////////////////////////////////////////// color_class { name: "/fg/normal/text-heading"; color: 255 255 255 255; } + color_class { name: "/fg/disabled/text-heading"; + color: 128 128 128 255; } color_class { name: "/fg/normal/text-heading-sub"; color: 255 255 255 255; } + color_class { name: "/fg/disabled/text-heading-sub"; + color: 128 128 128 255; } color_class { name: "/fg/normal/text-hilight"; color: 255 255 255 255; } -// color_class { name: "/fg/normal/text-overlay"; -// color: 160 160 160 255; } + color_class { name: "/fg/disabled/text-hilight"; + color: 128 128 128 255; } + color_class { name: "/fg/normal/text-overlay"; + color: 220 220 220 255; } + color_class { name: "/fg/disabled/text-overlay"; + color: 128 128 128 255; } color_class { name: "/fg/normal/text-subtle"; color: 0 0 0 64; } + color_class { name: "/fg/disabled/text-subtle"; + color: 0 0 0 48; } color_class { name: "/fg/normal/text-urgent"; color: 255 51 51 255; } - color_class { name: "/fg/disabled/text-heading"; - color: 160 160 160 255; } - color_class { name: "/fg/normal/text-standout"; color: 51 153 255 255; } color_class { name: "/fg/disabled/text-standout"; @@ -437,6 +444,14 @@ color_classes { color: 255 51 51 255; } color_class { name: "/fg/disabled/text-failure"; color: 153 34 34 255; } + color_class { name: "/fg/normal/text-error"; + color: 255 51 51 255; } + color_class { name: "/fg/disabled/text-error"; + color: 153 34 34 255; } + color_class { name: "/fg/normal/text-fatal"; + color: 255 51 51 255; } + color_class { name: "/fg/disabled/text-fatal"; + color: 153 34 34 255; } color_class { name: "/fg/normal/text-code"; color: 255 255 255 255; } color_class { name: "/fg/disabled/text-code"; @@ -493,48 +508,50 @@ color_classes { color: 255 153 51 255; } color_class { name: "/fg/disabled/text-line-changed"; color: 128 76 25 255; } - -/////////////////////////////////////////////////////////////////////////////// -// XXX: need to find a bette way to deal with these? put missing ones from -// below into the above and then move elm code to use these new cc's -// look at elm_code_widget.c _elm_code_widget_setup_palette(0 - color_class { name: "elm/code/status/default"; color: 48 48 48 255; } - color_class { name: "elm/code/status/current"; color: 32 32 32 255; } - color_class { name: "elm/code/status/ignored"; color: 36 36 36 255; } - color_class { name: "elm/code/status/note"; color: 160 80 17 255; } - color_class { name: "elm/code/status/warning"; color: 160 80 17 255; } - color_class { name: "elm/code/status/error"; color: 160 32 17 255; } - color_class { name: "elm/code/status/fatal"; color: 160 32 17 255; } - color_class { name: "elm/code/status/added"; color: 36 96 36 255; } - color_class { name: "elm/code/status/removed"; color: 96 36 36 255; } - color_class { name: "elm/code/status/changed"; color: 36 36 96 255; } - color_class { name: "elm/code/status/passed"; color: 54 96 54 255; } - color_class { name: "elm/code/status/failed"; color: 96 54 54 255; } - color_class { name: "elm/code/status/todo"; color: 48 80 160 255; } - - color_class { name: "elm/code/token/default"; color: 160 160 160 255; } - color_class { name: "elm/code/token/comment"; color: 255 255 255 48; } - color_class { name: "elm/code/token/string"; color: 255 136 119 255; } - color_class { name: "elm/code/token/number"; color: 170 153 34 255; } - color_class { name: "elm/code/token/brace"; color: 170 102 170 255; } - color_class { name: "elm/code/token/type"; color: 255 255 255 255; } - color_class { name: "elm/code/token/class"; color: 255 255 255 255; } - color_class { name: "elm/code/token/function"; color: 255 255 255 255; } - color_class { name: "elm/code/token/param"; color: 187 187 187 255; } - color_class { name: "elm/code/token/keyword"; color: 68 136 204 255; } - color_class { name: "elm/code/token/preprocessor"; color: 102 255 85 255; } - color_class { name: "elm/code/token/added"; color: 54 255 54 255; } - color_class { name: "elm/code/token/removed"; color: 255 54 54 255; } - color_class { name: "elm/code/token/changed"; color: 54 54 255 255; } - color_class { name: "elm/code/token/match"; color: 187 187 51 128; } - - color_class { name: "elm/code/widget/color/selection"; color: 51 153 255 128; } - color_class { name: "elm/code/widget/color/gutter/bg"; color: 64 64 64 255; } - color_class { name: "elm/code/widget/color/gutter/fg"; color: 128 128 128 255; } - color_class { name: "elm/code/widget/color/gutter/scope/bg"; color: 54 54 54 255; } - color_class { name: "elm/code/widget/color/whitespace"; color: 96 96 96 255; } -/////////////////////////////////////////////////////////////////////////////// - + color_class { name: "/fg/normal/text-status"; + color: 48 48 49 255; } + color_class { name: "/fg/disabled/text-status"; + color: 56 56 56 255; } + color_class { name: "/fg/normal/text-match"; + color: 187 187 51 255; } + color_class { name: "/fg/disabled/text-match"; + color: 96 96 25 255; } + color_class { name: "/fg/normal/text-current"; + color: 32 32 32 255; } + color_class { name: "/fg/disabled/text-current"; + color: 48 48 48 255; } + color_class { name: "/fg/normal/text-ignored"; + color: 36 36 36 255; } + color_class { name: "/fg/disabled/text-ignored"; + color: 44 44 44 255; } + color_class { name: "/fg/normal/text-note"; + color: 160 80 17 255; } + color_class { name: "/fg/disabled/text-note"; + color: 80 40 8 255; } + color_class { name: "/fg/normal/text-todo"; + color: 40 80 160 255; } + color_class { name: "/fg/disabled/text-todo"; + color: 20 40 80 255; } + color_class { name: "/fg/normal/text-gutter"; + color: 128 128 128 255; } + color_class { name: "/fg/disabled/text-gutter"; + color: 80 80 80 255; } + color_class { name: "/bg/normal/text-gutter"; + color: 64 64 64 255; } + color_class { name: "/bg/disabled/text-gutter"; + color: 64 64 64 255; } + color_class { name: "/bg/normal/text-scope"; + color: 54 54 54 255; } + color_class { name: "/bg/disabled/text-scope"; + color: 58 58 58 255; } + color_class { name: "/bg/normal/text-whitespace"; + color: 96 96 96 255; } + color_class { name: "/bg/disabled/text-whitespace"; + color: 80 80 80 255; } + color_class { name: "/bg/normal/text-selection"; + color: 51 153 255 128; } + color_class { name: "/bg/disabled/text-selection"; + color: 25 76 128 128; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/normal/flipselector/down"; color: 96 96 96 255; } diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c index cbced2924d..149d604946 100644 --- a/src/lib/elementary/elm_code_widget.c +++ b/src/lib/elementary/elm_code_widget.c @@ -1966,43 +1966,43 @@ _elm_code_widget_setup_palette(Evas_Object *o, Evas_Object *layout, float fade) edje = elm_layout_edje_get(layout); // setup status colors - _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_DEFAULT, "elm/code/status/default", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_CURRENT, "elm/code/status/current", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_IGNORED, "elm/code/status/ignored", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_NOTE, "elm/code/status/note", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_WARNING, "elm/code/status/warning", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_ERROR, "elm/code/status/error", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_FATAL, "elm/code/status/fatal", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_ADDED, "elm/code/status/added", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_REMOVED, "elm/code/status/removed", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_CHANGED, "elm/code/status/changed", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_PASSED, "elm/code/status/passed", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_FAILED, "elm/code/status/failed", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_TODO, "elm/code/status/todo", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_DEFAULT, "/fg/normal/text-status", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_CURRENT, "/fg/normal/text-current", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_IGNORED, "/fg/normal/text-ignored", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_NOTE, "/fg/normal/text-note", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_WARNING, "/fg/normal/text-warning", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_ERROR, "/fg/normal/text-error", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_FATAL, "/fg/normal/text-fatal", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_ADDED, "/fg/normal/text-line-added", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_REMOVED, "/fg/normal/text-line-removed", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_CHANGED, "/fg/normal/text-line-changed", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_PASSED, "/fg/normal/text-success", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_FAILED, "/fg/normal/text-failure", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_STATUS_TYPE_TODO, "/fg/normal/text-todo", fade, edje); // setup token colors - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_DEFAULT, "elm/code/token/default", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_COMMENT, "elm/code/token/comment", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_STRING, "elm/code/token/string", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_NUMBER, "elm/code/token/number", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_BRACE, "elm/code/token/brace", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_TYPE, "elm/code/token/type", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_CLASS, "elm/code/token/class", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_FUNCTION, "elm/code/token/function", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_PARAM, "elm/code/token/param", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_KEYWORD, "elm/code/token/keyword", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_PREPROCESSOR, "elm/code/token/preprocessor", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_ADDED, "elm/code/token/added", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_REMOVED, "elm/code/token/removed", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_CHANGED, "elm/code/token/changed", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_MATCH, "elm/code/token/match", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_DEFAULT, "/fg/normal/text", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_COMMENT, "/fg/normal/text-comment", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_STRING, "/fg/normal/text-string", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_NUMBER, "/fg/normal/text-number", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_BRACE, "/fg/normal/text-brace", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_TYPE, "/fg/normal/text-type", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_CLASS, "/fg/normal/text-class", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_FUNCTION, "/fg/normal/text-function", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_PARAM, "/fg/normal/text-param", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_KEYWORD, "/fg/normal/text-keyword", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_PREPROCESSOR, "/fg/normal/text-preprocessor", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_ADDED, "/fg/normal/text-line-added", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_REMOVED, "/fg/normal/text-line-removed", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_CHANGED, "/fg/normal/text-line-changed", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_TOKEN_TYPE_MATCH, "/fg/normal/text-match", fade, edje); // other styles that the widget uses - _elm_code_widget_setup_palette_item(o, ELM_CODE_WIDGET_COLOR_SELECTION, "elm/code/widget/color/selection", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_WIDGET_COLOR_GUTTER_BG, "elm/code/widget/color/gutter/bg", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_WIDGET_COLOR_GUTTER_FG, "elm/code/widget/color/gutter/fg", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_WIDGET_COLOR_GUTTER_SCOPE_BG, "elm/code/widget/color/scope/bg", fade, edje); - _elm_code_widget_setup_palette_item(o, ELM_CODE_WIDGET_COLOR_WHITESPACE, "elm/code/widget/color/whitespace", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_WIDGET_COLOR_SELECTION, "/bg/normal/text-selection", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_WIDGET_COLOR_GUTTER_BG, "/bg/normal/text-gutter", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_WIDGET_COLOR_GUTTER_FG, "/fg/normal/text-gutter", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_WIDGET_COLOR_GUTTER_SCOPE_BG, "/bg/normal/text-scope", fade, edje); + _elm_code_widget_setup_palette_item(o, ELM_CODE_WIDGET_COLOR_WHITESPACE, "/bg/normal/text-whitespace", fade, edje); } static void --
