From 90f32f77ff38226c133b3a999b505654141f6b27 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 29 Jun 2021 19:55:55 +0100 Subject: [PATCH] elm theme - more cc --- data/elementary/themes/colorclasses.edc | 16 ++++++++++++++++ data/elementary/themes/edc/pointer.edc | 21 +++++++++++---------- data/elementary/themes/edc/preview.edc | 8 +++----- data/elementary/themes/edc/radio.edc | 21 +++++++++++---------- 4 files changed, 41 insertions(+), 25 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index 5e08474e2b..0c957b23df 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -54,6 +54,13 @@ color_classes { color: 48 48 48 255; } color_class { name: "/bg/normal/menu/item/radio/base"; color: 48 48 48 255; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/pointer/base"; + color: 255 255 255 255; } + color_class { name: "/fg/pressed/pointer/base"; + color: 51 153 255 255; } + color_class { name: "/fg/normal/pointer/manipulator"; + color: 51 153 255 192; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/normal/access"; color: 255 153 51 64; } @@ -346,6 +353,15 @@ color_classes { color: 56 56 56 255; } color_class { name: "/fg/selected/check/check"; color: 160 160 160 255; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/radio/base"; + color: 48 48 48 255; } + color_class { name: "/bg/pressed/radio/base"; + color: 32 32 32 255; } + color_class { name: "/bg/disabled/radio/base"; + color: 56 56 56 255; } + color_class { name: "/fg/selected/radio/radio"; + color: 160 160 160 255; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/normal/toggle/base"; color: 48 48 48 255; } diff --git a/data/elementary/themes/edc/pointer.edc b/data/elementary/themes/edc/pointer.edc index b425c6bb24..3adf45455f 100644 --- a/data/elementary/themes/edc/pointer.edc +++ b/data/elementary/themes/edc/pointer.edc @@ -5,14 +5,14 @@ group { name: "e/pointer/enlightenment/default/color"; part { name: "parent"; type: RECT; scale: 1; description { state: "default" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc FIXED_SIZE(32, 32) } description { state: "suspend" 0.0; inherit: "default" 0.0; rel1.relative: 0.5 0.5; rel2.relative: 0.5 0.5; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } } part { name: "base"; @@ -20,10 +20,11 @@ group { name: "e/pointer/enlightenment/default/color"; description { state: "default" 0.0; image.normal: "pointer.png"; rel.to: "parent"; + color_class: "/fg/normal/pointer/base"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 51 153 255 255; + color_class: "/fg/pressed/pointer/base"; } } part { name: "e.swallow.hotspot"; type: SWALLOW; @@ -121,10 +122,9 @@ group { name: "e/pointer/enlightenment/default/mono"; part { name: "e.swallow.hotspot"; type: SWALLOW; description { state: "default" 0.0; fixed: 1 1; + rel.to: "base"; rel1.offset: 6 8; - rel1.to: "base"; rel2.offset: 6 8; - rel2.to: "base"; rel2.relative: 0.0 0.0; } } @@ -137,7 +137,7 @@ group { name: "e/pointer/enlightenment/resize_br/color"; part { name: "box"; type: RECT; insert_after: "base"; description { state: "default" 0.0; - color: 51 153 255 192; + color_class: "/fg/normal/pointer/manipulator"; rel1.relative: 0.3 0.3; rel2.relative: 0.7 0.7; } @@ -283,7 +283,7 @@ group { name: "e/pointer/enlightenment/hand/color"; part { name: "box"; type: RECT; insert_after: "base"; description { state: "default" 0.0; - color: 51 153 255 192; + color_class: "/fg/normal/pointer/manipulator"; rel1.relative: 0.5 0.5; rel2.relative: 1.0 1.0; } @@ -354,7 +354,7 @@ group { name: "e/pointer/enlightenment/rotate/color"; part { name: "box"; type: RECT; insert_after: "base"; description { state: "default" 0.0; - color: 51 153 255 192; + color_class: "/fg/normal/pointer/manipulator"; rel1.relative: 0.3 0.3; rel2.relative: 0.8 0.8; map.on: 1; @@ -405,11 +405,11 @@ group { name: "e/pointer/enlightenment/plus/color"; aspect: 1.0 1.0; aspect_preference: BOTH; rel1.relative: (40/128) (40/128); rel2.relative: (76/128) (76/128); - color: 53 153 255 255; + color_class: "/fg/normal/pointer/manipulator"; } description { state: "faded" 0.0; inherit: "default" 0.0; - color: 53 153 255 128; + color: 255 255 255 128; // no cc } } } @@ -436,6 +436,7 @@ group { name: "e/pointer/enlightenment/entry/color"; part { name: "base"; scale: 1; description { state: "default" 0.0; + color_class: "/fg/normal/pointer/base"; image.normal: "pointer_entry.png"; aspect: (44/88) (44/88); aspect_preference: VERTICAL; FIXED_SIZE(32, 32) diff --git a/data/elementary/themes/edc/preview.edc b/data/elementary/themes/edc/preview.edc index eeb57a4775..4f99f0a2bc 100644 --- a/data/elementary/themes/edc/preview.edc +++ b/data/elementary/themes/edc/preview.edc @@ -2,15 +2,13 @@ group { name: "e/widgets/preview"; parts { part { name: "bg"; type: RECT; description { state: "default" 0.0; - rel1.to: "e.swallow.content"; - rel2.to: "e.swallow.content"; - color: 64 64 64 255; + rel.to: "e.swallow.content"; + color_class: "/bg/normal/preview"; } } part { name: "clipper"; type: RECT; description { state: "default" 0.0; - rel1.to: "e.swallow.content"; - rel2.to: "e.swallow.content"; + rel.to: "e.swallow.content"; } } part { name: "e.swallow.content"; type: SWALLOW; diff --git a/data/elementary/themes/edc/radio.edc b/data/elementary/themes/edc/radio.edc index a68ca6d8d2..f32207a273 100644 --- a/data/elementary/themes/edc/radio.edc +++ b/data/elementary/themes/edc/radio.edc @@ -3,6 +3,7 @@ group { name: "e/widgets/radio"; part { name: "base"; mouse_events: 0; scale: 1; description { state: "default" 0.0; + color_class: "/bg/normal/radio/base"; min: 15 15; max: 15 15; rel1.offset: 3 3; @@ -10,13 +11,12 @@ group { name: "e/widgets/radio"; rel2.relative: 0.0 1.0; image.normal: "i-radio"; align: 0.0 0.5; - color: 0 0 0 64; offscale; fixed: 1 1; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 0 0 0 16; + color_class: "/bg/disabled/radio/base"; } } part { name: "clip"; type: RECT; @@ -24,7 +24,7 @@ group { name: "e/widgets/radio"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 153 153 153 255; + color: 255 255 255 153; // no cc } } part { name: "indicator"; mouse_events: 0; @@ -32,16 +32,17 @@ group { name: "e/widgets/radio"; description { state: "default" 0.0; rel.to: "base"; image.normal: "radio.png"; - color: 160 160 160 255; + color_class: "/fg/normal/radio/radio"; visible: 0; } description { state: "selected" 0.0; inherit: "default" 0.0; + color_class: "/fg/pressed/radio/radio"; visible: 1; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/radio/radio"; visible: 1; } } @@ -52,7 +53,7 @@ group { name: "e/widgets/radio"; rel1.to_x: "base"; rel1.relative: 1.0 0.0; rel2.offset: -5 -5; - color: 160 160 160 255; + color_class: "/fg/normal/radio/text"; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -63,17 +64,17 @@ group { name: "e/widgets/radio"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 96 96 96 255; + color_class: "/fg/disabled/radio/text"; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/radio/text"; } } part { name: "event"; type: RECT; ignore_flags: ON_HOLD; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -145,7 +146,7 @@ group { name: "e/widgets/radio_icon"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 96 96 96 255; + color_class: "/fg/disabled/radio/text"; } } }