From d6a896ef96db482ef11cb4ab5325ffa1f2ebe35f Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Thu, 8 Jul 2021 14:02:33 +0100 Subject: [PATCH] elm theme - more cc --- data/elementary/themes/colorclasses.edc | 13 +-- data/elementary/themes/edc/conf.edc | 1 - data/elementary/themes/edc/elm/button.edc | 6 +- data/elementary/themes/edc/toolbar.edc | 97 +++++++++-------------- 4 files changed, 47 insertions(+), 70 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index 422069dce3..dfcad9dd5f 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -44,7 +44,11 @@ color_classes { color: 0 0 0 64; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/dim"; + color: 0 0 0 160; } + color_class { name: "/dim/pressed"; color: 0 0 0 200; } + color_class { name: "/dim/disabled"; + color: 0 0 0 80; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/fg/normal/menu/title"; color: 255 255 255 255; } @@ -210,12 +214,6 @@ color_classes { color: 255 255 255 255; } color_class { name: "/fg/disabled/button"; color: 97 96 96 255; } - color_class { name: "/bg/normal/button-overlay"; - color: 0 0 0 160; } - color_class { name: "/bg/pressed/button-overlay"; - color: 0 0 0 200; } - color_class { name: "/bg/disabled/button-overlay"; - color: 0 0 0 80; } color_class { name: "/fg/normal/button-anchor"; color: 51 153 255 255; } color_class { name: "/fg/pressed/button-anchor"; @@ -432,6 +430,9 @@ color_classes { /////////////////////////////////////////////////////////////////////////////// color_class { name: "/fg/selected/edgebindings/edge"; color: 51 153 255 255; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/selected/toolbar/base"; + color: 32 32 32 255; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/fg/normal/gadgets/temperature/low"; color: 51 153 255 255; } diff --git a/data/elementary/themes/edc/conf.edc b/data/elementary/themes/edc/conf.edc index 7c66ee40da..4bbf4c2113 100644 --- a/data/elementary/themes/edc/conf.edc +++ b/data/elementary/themes/edc/conf.edc @@ -23,7 +23,6 @@ group { name: "e/widgets/configure/main"; part { name: "e.swallow.content"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - rel1.offset: 0 8; rel1.to_x: "base"; rel2.relative: 1.0 0.0; rel2.offset: -1 -17; diff --git a/data/elementary/themes/edc/elm/button.edc b/data/elementary/themes/edc/elm/button.edc index 183998964b..0e95d1cecc 100644 --- a/data/elementary/themes/edc/elm/button.edc +++ b/data/elementary/themes/edc/elm/button.edc @@ -611,15 +611,15 @@ group { name: "elm/button/base/overlay"; } part { name: "base"; description { state: "default" 0.0; - color_class: "/bg/normal/button-overlay"; + color_class: "/dim/normal/button-overlay"; visible: 1; } description { state: "pressed" 0.0; - color_class: "/bg/pressed/button-overlay"; + color_class: "/dim/pressed/button-overlay"; visible: 1; } description { state: "disabled" 0.0; - color_class: "/bg/disabled/button-overlay"; + color_class: "/dim/disabled/button-overlay"; visible: 0; } } diff --git a/data/elementary/themes/edc/toolbar.edc b/data/elementary/themes/edc/toolbar.edc index 1456533e59..a4cc086c7d 100644 --- a/data/elementary/themes/edc/toolbar.edc +++ b/data/elementary/themes/edc/toolbar.edc @@ -2,13 +2,12 @@ group { name: "e/widgets/toolbar"; parts { part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 64 64 64 255; + color_class: "/bg/normal/toolbar"; } } part { name: "clipper"; type: RECT; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; } } part { name: "e.swallow.content"; type: SWALLOW; @@ -21,8 +20,7 @@ group { name: "e/widgets/toolbar"; dragable.y: 0 0 0; dragable.confine: "base"; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; visible: 0; } } @@ -39,15 +37,14 @@ group { name: "e/widgets/toolbar"; clip_to: "arrow_clipper"; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; align: 0.0 0.5; - color: 0 0 0 128; + color_class: "/dim/normal/toolbar/arrow"; FIXED_SIZE(23, 23) } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 0 0 0 192; + color_class: "/dim/pressed/toolbar/arrow"; } } part { name: "arrow1"; mouse_events: 0; @@ -55,15 +52,14 @@ group { name: "e/widgets/toolbar"; clip_to: "arrow_clipper"; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "arrow1_ev"; - rel2.to: "arrow1_ev"; + rel.to: "arrow1_ev"; image.normal: "i-arrow-l"; FIXED_SIZE(15, 15) - color: 160 160 160 255; + color_class: "/fg/normal/toolbar/arrow"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/toolbar/arrow"; } } part { name: "arrow2_ev"; type: RECT; @@ -71,15 +67,14 @@ group { name: "e/widgets/toolbar"; clip_to: "arrow_clipper"; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; align: 1.0 0.5; - color: 0 0 0 128; + color_class: "/dim/normal/toolbar/arrow"; FIXED_SIZE(23, 23) } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 0 0 0 192; + color_class: "/dim/pressed/toolbar/arrow"; } } part { name: "arrow2"; mouse_events: 0; @@ -87,34 +82,28 @@ group { name: "e/widgets/toolbar"; clip_to: "arrow_clipper"; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "arrow2_ev"; - rel2.to: "arrow2_ev"; + rel.to: "arrow2_ev"; image.normal: "i-arrow-r"; FIXED_SIZE(15, 15) - color: 160 160 160 255; + color_class: "/fg/normal/toolbar/arrow"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/toolbar/arrow"; } } } programs { - program { - signal: "e,action,show,hbar"; source: "e"; + program { signal: "e,action,show,hbar"; source: "e"; action: STATE_SET "default" 0.0; target: "arrow_clipper"; - target: "arrow_clipper"; } - program { - signal: "e,action,hide,hbar"; source: "e"; + program { signal: "e,action,hide,hbar"; source: "e"; action: STATE_SET "hidden" 0.0; target: "arrow_clipper"; - target: "arrow_clipper"; } - program { - signal: "mouse,down,1*"; source: "arrow1_ev"; + program { signal: "mouse,down,1*"; source: "arrow1_ev"; action: SIGNAL_EMIT "e,action,prev" "e"; after: "arrow1_repeat"; } @@ -123,26 +112,22 @@ group { name: "e/widgets/toolbar"; in: 0.3 0.0; after: "arrow1_repeat"; } - program { - signal: "mouse,up,1"; source: "arrow1_ev"; + program { signal: "mouse,up,1"; source: "arrow1_ev"; action: ACTION_STOP; target: "arrow1_repeat"; } - program { - signal: "mouse,down,1*"; source: "arrow1_ev"; + program { signal: "mouse,down,1*"; source: "arrow1_ev"; action: STATE_SET "clicked" 0.0; target: "arrow1"; target: "arrow1_ev"; } - program { - signal: "mouse,up,1"; source: "arrow1_ev"; + program { signal: "mouse,up,1"; source: "arrow1_ev"; action: STATE_SET "default" 0.0; target: "arrow1"; target: "arrow1_ev"; } - program { - signal: "mouse,down,1*"; source: "arrow2_ev"; + program { signal: "mouse,down,1*"; source: "arrow2_ev"; action: SIGNAL_EMIT "e,action,next" "e"; after: "arrow2_repeat"; } @@ -151,19 +136,16 @@ group { name: "e/widgets/toolbar"; in: 0.3 0.0; after: "arrow2_repeat"; } - program { - signal: "mouse,up,1"; source: "arrow2_ev"; + program { signal: "mouse,up,1"; source: "arrow2_ev"; action: ACTION_STOP; target: "arrow2_repeat"; } - program { - signal: "mouse,down,1*"; source: "arrow2_ev"; + program { signal: "mouse,down,1*"; source: "arrow2_ev"; action: STATE_SET "clicked" 0.0; target: "arrow2"; target: "arrow2_ev"; } - program { - signal: "mouse,up,1"; source: "arrow2_ev"; + program { signal: "mouse,up,1"; source: "arrow2_ev"; action: STATE_SET "default" 0.0; target: "arrow2"; target: "arrow2_ev"; @@ -175,12 +157,12 @@ group { name: "e/widgets/toolbar/item"; parts { part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 80 80 80 0; + color_class: "/bg/normal/toolbar/base"; visible: 0; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 80 80 80 255; + color_class: "/bg/selected/toolbar/base"; visible: 1; } } @@ -210,7 +192,7 @@ group { name: "e/widgets/toolbar/item"; rel1.relative: 0.0 1.0; rel2.offset: -5 -10; align: 0.5 1.0; - color: 160 160 160 255; + color_class: "/fg/normal/toolbar/text"; visible: 0; text { font: FN; size: 10; min: 1 1; @@ -231,7 +213,7 @@ group { name: "e/widgets/toolbar/item"; description { state: "default" 0.0; rel.to: "e.text.label"; align: 0.5 1.0; - color: 160 160 160 255; + color_class: "/fg/normal/toolbar/text"; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -246,7 +228,7 @@ group { name: "e/widgets/toolbar/item"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/toolbar/text"; } } part { name: "bar"; type: RECT; mouse_events: 0; @@ -257,7 +239,7 @@ group { name: "e/widgets/toolbar/item"; rel1.to: "base"; rel2.offset: -1 0; rel2.to: "base"; - color: 51 153 255 255; + color_class: "/bg/selected/toolbar/bar"; visible: 0; align: 0.5 1.0; min: 5 0; @@ -272,43 +254,38 @@ group { name: "e/widgets/toolbar/item"; 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 } } } programs { - program { - signal: "e,icon,disabled"; source: "e"; + program { signal: "e,icon,disabled"; source: "e"; action: STATE_SET "noicon" 0.0; target: "e.swallow.icon"; target: "e.text.label"; target: "label2"; } - program { - signal: "e,icon,enabled"; source: "e"; + program { signal: "e,icon,enabled"; source: "e"; action: STATE_SET "default" 0.0; target: "e.swallow.icon"; target: "e.text.label"; target: "label2"; } - program { - signal: "e,state,selected"; source: "e"; + program { signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; transition: ACCELERATE 0.2; target: "label2"; target: "base"; target: "bar"; } - program { - signal: "e,state,unselected"; source: "e"; + program { signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; transition: DECELERATE 0.2; target: "label2"; target: "base"; target: "bar"; } - program { - signal: "mouse,up,1"; source: "event"; + program { signal: "mouse,up,1"; source: "event"; action: SIGNAL_EMIT "e,action,click" "e"; } }