From 6c4fc5bc8de3bea0eccc124fcfc9a41c35521d7a Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Sat, 15 May 2021 13:39:29 +0100
Subject: [PATCH] elm theme - more cc's

---
 data/elementary/themes/edc/conf.edc   | 24 +++++++++++++-----------
 data/elementary/themes/edc/dialog.edc | 13 ++++++-------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/data/elementary/themes/edc/conf.edc b/data/elementary/themes/edc/conf.edc
index e56f73f0b3..7c66ee40da 100644
--- a/data/elementary/themes/edc/conf.edc
+++ b/data/elementary/themes/edc/conf.edc
@@ -2,10 +2,11 @@ group { name: "e/widgets/configure/main";
    parts {
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            color: 64 64 64 255;
+            color_class: "/bg/normal/background";
          }
       }
       part { name: "separator"; type: RECT; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             min: 16 1;
             max: 99999 1;
@@ -16,19 +17,22 @@ group { name: "e/widgets/configure/main";
             rel2.offset: -1 -1;
             rel2.to_y: "e.swallow.button";
             fixed: 0 1;
-            color: 72 72 72 255;
+            color_class: "/fg/normal/separator/horizontal";
          }
       }
       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;
             rel2.to_y: "e.swallow.button";
+            offscale;
          }
       }
       part { name: "e.swallow.button"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
             align: 0.5 1.0;
             rel1.relative: 0.5 1.0;
@@ -36,6 +40,7 @@ group { name: "e/widgets/configure/main";
             rel2.relative: 0.5 1.0;
             rel2.offset: -1 -9;
             fixed: 1 1;
+            offscale;
          }
       }
    }
@@ -47,7 +52,7 @@ group { name: "e/modules/conf/main";
    parts {
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
@@ -61,30 +66,27 @@ group { name: "e/modules/conf/main";
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
             image.normal: "spanner.png";
+            color_class: "/fg/normal/icon";
             offscale;
-            color: 160 160 160 255;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color_class: "/fg/pressed/icon";
          }
       }
    }
    programs {
-      program {
-         signal: "mouse,down,1"; source: "base";
+      program { signal: "mouse,down,1"; source: "base";
          action: STATE_SET "clicked" 0.0;
          target: "base";
          target: "spanner";
       }
-      program {
-         signal: "mouse,up,1"; source: "base";
+      program { signal: "mouse,up,1"; source: "base";
          action: STATE_SET "default" 0.0;
          target: "base";
          target: "spanner";
       }
-      program {
-         signal: "mouse,clicked,1*"; source: "base";
+      program { signal: "mouse,clicked,1*"; source: "base";
          action: SIGNAL_EMIT "e,action,conf" "";
       }
    }
diff --git a/data/elementary/themes/edc/dialog.edc b/data/elementary/themes/edc/dialog.edc
index 01c4119f52..81a394fda7 100644
--- a/data/elementary/themes/edc/dialog.edc
+++ b/data/elementary/themes/edc/dialog.edc
@@ -2,10 +2,11 @@ group { name: "e/widgets/dialog/main";
    parts {
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            color: 64 64 64 255;
+            color_class: "/bg/normal/background";
          }
       }
       part { name: "separator"; type: RECT; mouse_events: 0;
+         scale:  1;
          description { state: "default" 0.0;
             min: 16 1;
             max: 99999 1;
@@ -15,7 +16,7 @@ group { name: "e/widgets/dialog/main";
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 -1;
             rel2.to_y: "e.swallow.buttons";
-            color: 72 72 72 255;
+            color_class: "/fg/normal/separator/horizontal";
             fixed: 0 1;
             link.base: "e,state,buttons,on" "e";
             visible: 1;
@@ -88,14 +89,12 @@ group { name: "e/widgets/dialog/main";
       }
    }
    programs {
-      program {
-         signal: "e,icon,enabled"; source: "e";
+      program { signal: "e,icon,enabled"; source: "e";
          action: STATE_SET "icon" 0.0;
          target: "e.swallow.icon";
          target: "e.swallow.content";
       }
-      program {
-         signal: "e,icon,disabled"; source: "e";
+      program { signal: "e,icon,disabled"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.swallow.icon";
          target: "e.swallow.content";
@@ -106,7 +105,7 @@ group { name: "e/widgets/dialog/main";
 group { name: "e/widgets/dialog/text";
    styles {
       style { name: "dialog_style";
-         base: "font="FN" font_size=10 text_class=tb_plain align=center color=#a0a0a0 wrap=word";
+         base: "font="FN" font_size=10 text_class=tb_plain align=center color_class=/bg/normal/text wrap=word";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD" text_class=tb_light";
       }