raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6fb139f5f1e658ba5a485370acf7d82697a8063a
commit 6fb139f5f1e658ba5a485370acf7d82697a8063a
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Tue Jun 1 10:07:18 2021 +0100
elm theme - more cc work
---
data/elementary/themes/edc/button.edc | 44 ++++++++++----------------------
data/elementary/themes/edc/check.edc | 1 +
data/elementary/themes/edc/elm/check.edc | 1 -
3 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/data/elementary/themes/edc/button.edc
b/data/elementary/themes/edc/button.edc
index 1f938cc6c2..c0cd5b0341 100644
--- a/data/elementary/themes/edc/button.edc
+++ b/data/elementary/themes/edc/button.edc
@@ -6,35 +6,39 @@ group { name: "e/widgets/button";
description { state: "default" 0.0;
rel.to: "base";
WIN_SHADOW_SMALL;
+ color_class: "/shadow/normal/button";
}
description { state: "clicked" 0.0;
inherit;
image.border_scale_by: 0.25;
- rel1.offset: -5 -3;
- rel2.offset: 4 6;
+ rel1.offset: -2 -1;
+ rel2.offset: 0 1;
+ offscale;
+ color_class: "/shadow/pressed/button";
}
}
rect { "base";
scale: 1;
desc { "default";
- color: 51 153 255 255;
+ color_class: "/bg/normal/button";
rel1.offset: 2 2;
rel2.offset: -3 -3;
offscale;
}
desc { "clicked"; inherit;
- color: 255 153 51 255;
+ color_class: "/bg/pressed/button";
}
desc { "disabled"; inherit;
- color: 64 64 64 255;
+ color_class: "/bg/disabled/button";
}
}
part { name: "icon_clip"; type: RECT;
description { state: "default" 0.0;
+ color: 255 255 255 255; // no cc
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 64;
+ color: 255 255 255 64; // no cc
}
}
part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
@@ -83,7 +87,7 @@ group { name: "e/widgets/button";
clip_to: "label_clip";
description { state: "default" 0.0;
fixed: 0 0;
- color: 255 255 255 255;
+ color_class: "/fg/normal/button";
rel1.offset: 4 4;
rel1.relative: 1.0 0.0;
rel1.to_x: "e.swallow.icon";
@@ -100,7 +104,7 @@ group { name: "e/widgets/button";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 96 96 96 255;
+ color_class: "/fg/disabled/button";
}
description { state: "combo" 0.0;
inherit: "default" 0.0;
@@ -111,21 +115,7 @@ group { name: "e/widgets/button";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "glow"; type: RECT; mouse_events: 0;
- description { state: "default" 0.0;
- rel.to: "base";
- rel1.relative: 0.0 1.0;
- color: 255 255 255 255;
- align: 0.5 1.0;
- visible: 0;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- min: 0 5;
- visible: 1;
+ color_class: "/fg/pressed/button";
}
}
part { name: "event"; type: RECT;
@@ -193,13 +183,5 @@ group { name: "e/widgets/button";
target: "icon_clip";
target: "e.text.label";
}
- program { signal: "e,state,focused"; source: "e";
- action: STATE_SET "focused" 0.0;
- target: "glow";
- }
- program { signal: "e,state,unfocused"; source: "e";
- action: STATE_SET "default" 0.0;
- target: "glow";
- }
}
}
diff --git a/data/elementary/themes/edc/check.edc
b/data/elementary/themes/edc/check.edc
index f455396e60..339ede176a 100644
--- a/data/elementary/themes/edc/check.edc
+++ b/data/elementary/themes/edc/check.edc
@@ -28,6 +28,7 @@ group { name: "e/widgets/check";
}
part { name: "indicator"; mouse_events: 0;
clip_to: "clip";
+ scale: 1;
description { state: "default" 0.0;
rel.to: "base";
image.normal: "i-check";
diff --git a/data/elementary/themes/edc/elm/check.edc
b/data/elementary/themes/edc/elm/check.edc
index b8019ffa7b..4a9217286d 100644
--- a/data/elementary/themes/edc/elm/check.edc
+++ b/data/elementary/themes/edc/elm/check.edc
@@ -1,4 +1,3 @@
-
group { name: "elm/check/base/default";
script {
BUTTONMODE_SCRIPT
--
