raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=671fb7ee5fcdca8a62f863234c17db42acea6bf9

commit 671fb7ee5fcdca8a62f863234c17db42acea6bf9
Author: Carsten Haitzler <ras...@rasterman.com>
Date:   Fri Jul 30 16:33:27 2021 +0100

    elm theme - more cc
---
 data/elementary/themes/colorclasses.edc     |  2 ++
 data/elementary/themes/edc/elm/scroller.edc | 55 ++++++++++++++++-------------
 data/elementary/themes/edc/scrollframe.edc  |  2 +-
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/data/elementary/themes/colorclasses.edc 
b/data/elementary/themes/colorclasses.edc
index c2af19b86b..e610e0d5b6 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -66,6 +66,8 @@ color_classes {
    color_class { name: "/fg/normal/pointer/manipulator";
       color:  51 153 255 192; }
 ///////////////////////////////////////////////////////////////////////////////
+   color_class { name: "/bg/normal/scroller/base";
+      color:   0   0   0   0; }
    color_class { name: "/fg/normal/scroller/bar";
       color:  51 153 255 255; }
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/data/elementary/themes/edc/elm/scroller.edc 
b/data/elementary/themes/edc/elm/scroller.edc
index d4ba02dcb2..540eef1825 100644
--- a/data/elementary/themes/edc/elm/scroller.edc
+++ b/data/elementary/themes/edc/elm/scroller.edc
@@ -23,7 +23,7 @@ group { name: "elm/scroller/base/default";
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
             rel.to: "elm.swallow.background";
-            color: 0 0 0 0;
+            color_class: "/bg/normal/scroller/base";
          }
       }
       part { name: "clipper"; type: RECT;
@@ -57,7 +57,8 @@ group { name: "elm/scroller/base/default";
          scale: 1;
          clip_to: "sh_clip";
          description { state: "default" 0.0;
-            color: 255 255 255 0;
+            color_class: "/shadow/normal/scroller";
+            color: 255 255 255 0; // no cc
             rel.to: "elm.swallow.content";
             rel1.offset: 0 -1;
             rel2.offset: -1 -1;
@@ -68,7 +69,7 @@ group { name: "elm/scroller/base/default";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128;
+            color: 255 255 255 255; // no cc
             rel1.offset: 0 -16;
             rel2.offset: -1 15;
             visible: 1;
@@ -89,7 +90,8 @@ group { name: "elm/scroller/base/default";
          scale: 1;
          clip_to: "sh_clip";
          description { state: "default" 0.0;
-            color: 255 255 255 0;
+            color_class: "/shadow/normal/scroller";
+            color: 255 255 255 0; // no cc
             rel.to: "elm.swallow.content";
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 0;
@@ -100,7 +102,7 @@ group { name: "elm/scroller/base/default";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128;
+            color: 255 255 255 255; // no cc
             rel1.offset: 0 -16;
             rel2.offset: -1 15;
             visible: 1;
@@ -121,7 +123,8 @@ group { name: "elm/scroller/base/default";
          scale: 1;
          clip_to: "sh_clip";
          description { state: "default" 0.0;
-            color: 255 255 255 0;
+            color_class: "/shadow/normal/scroller";
+            color: 255 255 255 0; // no cc
             rel.to: "elm.swallow.content";
             rel1.offset: -1 0;
             rel2.offset: -1 -1;
@@ -132,7 +135,7 @@ group { name: "elm/scroller/base/default";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128;
+            color: 255 255 255 255; // no cc
             rel1.offset: -16 0;
             rel2.offset: 15 -1;
             visible: 1;
@@ -153,7 +156,8 @@ group { name: "elm/scroller/base/default";
          scale: 1;
          clip_to: "sh_clip";
          description { state: "default" 0.0;
-            color: 255 255 255 0;
+            color_class: "/shadow/normal/scroller";
+            color: 255 255 255 0; // no cc
             rel.to: "elm.swallow.content";
             rel1.relative: 1.0 0.0;
             rel1.offset: 0 0;
@@ -164,7 +168,7 @@ group { name: "elm/scroller/base/default";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128;
+            color: 255 255 255 255; // no cc
             rel1.offset: -16 0;
             rel2.offset: 15 -1;
             visible: 1;
@@ -217,7 +221,7 @@ group { name: "elm/scroller/base/default";
       part { name: "sb_vbar_p1"; type: RECT;
          clip_to: "sb_vbar";
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             rel1.to: "sb_vbar";
             rel2.relative: 1.0 0.0;
             rel2.to: "elm.dragable.vbar";
@@ -227,7 +231,7 @@ group { name: "elm/scroller/base/default";
       part { name: "sb_vbar_p2"; type: RECT;
          clip_to: "sb_vbar";
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             rel1.relative: 0.0 1.0;
             rel1.to: "elm.dragable.vbar";
             rel2.to: "sb_vbar";
@@ -247,7 +251,7 @@ group { name: "elm/scroller/base/default";
             rel1.to: "sb_vbar";
             rel2.relative: 0.5  0.5;
             rel2.to: "sb_vbar";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -261,7 +265,7 @@ group { name: "elm/scroller/base/default";
          repeat_events: 1;
          scale: 1;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             rel1.to: "sb_vbar";
             rel1.offset: -45 0;
             rel2.to: "sb_vbar";
@@ -419,7 +423,7 @@ group { name: "elm/scroller/base/default";
       part { name: "sb_hbar_p1"; type: RECT;
          clip_to: "sb_hbar";
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             rel1.to: "sb_hbar";
             rel2.relative: 0.0 1.0;
             rel2.to: "elm.dragable.hbar";
@@ -429,7 +433,7 @@ group { name: "elm/scroller/base/default";
       part { name: "sb_hbar_p2"; type: RECT;
          clip_to: "sb_hbar";
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             rel1.relative: 1.0 0.0;
             rel1.to: "elm.dragable.hbar";
             rel2.to: "sb_hbar";
@@ -449,7 +453,7 @@ group { name: "elm/scroller/base/default";
             rel1.to: "sb_hbar";
             rel2.relative: 0.5  0.5;
             rel2.to: "sb_hbar";
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -463,7 +467,7 @@ group { name: "elm/scroller/base/default";
          repeat_events: 1;
          scale: 1;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
             rel1.to: "sb_hbar";
             rel1.offset: 0 -45;
             rel2.to: "sb_hbar";
@@ -597,15 +601,15 @@ group { name: "elm/scroller/base/default";
          clip_to: "sb_vbar_show";
          description { state: "default" 0.0;
             fixed: 1 1;
-            color: 51 153 255 255;
+            color_class: "/fg/normal/scroller/bar/vertical";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 80 80 80 255;
+            color_class: "/fg/disabled/scroller/bar/vertical";
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/scroller/bar/vertical";
          }
       }
 
@@ -631,15 +635,15 @@ group { name: "elm/scroller/base/default";
          clip_to: "sb_hbar_show";
          description { state: "default" 0.0;
             fixed: 1 1;
-            color: 51 153 255 255;
+            color_class: "/fg/normal/scroller/bar/horizontal";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 80 80 80 255;
+            color_class: "/fg/disabled/scroller/bar/horizontal";
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/scroller/bar/horizontal";
          }
       }
 
@@ -664,10 +668,11 @@ group { name: "elm/scroller/base/default";
 
       part { name: "dim_effect"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 32 32 32 0; // no cc
+            visible: 0;
          }
          description { state: "effect" 0.0;
-            color: 32 32 32 255;
+            color: 32 32 32 255; // no cc
          }
       }
    }
diff --git a/data/elementary/themes/edc/scrollframe.edc 
b/data/elementary/themes/edc/scrollframe.edc
index e612ab2e6a..409f40ef68 100644
--- a/data/elementary/themes/edc/scrollframe.edc
+++ b/data/elementary/themes/edc/scrollframe.edc
@@ -66,7 +66,7 @@ group { name: "e/widgets/scrollframe";
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
             rel.to: "e.swallow.content";
-            color: 0 0 0 0; // no cc
+            color_class: "/bg/normal/scroller/base";
          }
       }
       part { name: "clipper"; type: RECT;

-- 


Reply via email to