raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e5e9be1e8531b0bc87fc7112caab030d6072c004
commit e5e9be1e8531b0bc87fc7112caab030d6072c004
Author: Carsten Haitzler <ras...@rasterman.com>
Date: Fri Jul 30 15:03:53 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 5 ++
data/elementary/themes/edc/elm/segment_control.edc | 67 +++++++---------------
2 files changed, 27 insertions(+), 45 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 2bb1eff68a..c2af19b86b 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -79,6 +79,11 @@ color_classes {
color: 51 153 255 25; }
color_class { name: "/bg/normal/tiling/position/outline";
color: 51 153 255 255; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/bg/normal/segmentcontrol/item";
+ color: 96 96 96 255; }
+ color_class { name: "/bg/pressed/segmentcontrol/item";
+ color: 32 32 32 255; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/fg/normal/init/logo";
color: 255 255 255 255; }
diff --git a/data/elementary/themes/edc/elm/segment_control.edc
b/data/elementary/themes/edc/elm/segment_control.edc
index 2020286b20..b8983c246b 100644
--- a/data/elementary/themes/edc/elm/segment_control.edc
+++ b/data/elementary/themes/edc/elm/segment_control.edc
@@ -13,8 +13,8 @@ group { name: "elm/segment_control/base/default";
part { name: "bg"; type: RECT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- color: 0 0 0 0;
- min: 160 31;
+ color: 0 0 0 0; // no cc
+ min: 160 24;
}
}
}
@@ -29,81 +29,60 @@ group { name: "elm/segment_control/item/default";
}
description { state: "default_single" 0.0;
inherit: "default" 0.0;
- color: 80 80 80 255;
+ color_class: "/bg/normal/segmentcontrol/item";
visible: 1;
}
description { state: "default_left" 0.0;
- inherit: "default" 0.0;
- color: 80 80 80 255;
+ inherit: "default_single" 0.0;
visible: 1;
- rel2.offset: -2 -1;
}
description { state: "default_right" 0.0;
- inherit: "default" 0.0;
- color: 80 80 80 255;
+ inherit: "default_single" 0.0;
visible: 1;
- rel1.offset: 1 0;
}
description { state: "default_middle" 0.0;
- inherit: "default" 0.0;
- color: 80 80 80 255;
+ inherit: "default_single" 0.0;
visible: 1;
- rel1.offset: 1 0;
- rel2.offset: -2 -1;
}
description { state: "pressed_single" 0.0;
inherit: "default" 0.0;
- color: 40 40 40 255;
+ color_class: "/bg/pressed/segmentcontrol/item";
visible: 1;
}
description { state: "pressed_left" 0.0;
- inherit: "default" 0.0;
- color: 40 40 40 255;
+ inherit: "pressed_single" 0.0;
visible: 1;
- rel2.offset: -2 -1;
}
description { state: "pressed_right" 0.0;
- inherit: "default" 0.0;
- color: 40 40 40 255;
+ inherit: "pressed_single" 0.0;
visible: 1;
- rel1.offset: 1 0;
}
description { state: "pressed_middle" 0.0;
- inherit: "default" 0.0;
- color: 40 40 40 255;
+ inherit: "pressed_single" 0.0;
visible: 1;
- rel1.offset: 1 0;
- rel2.offset: -2 -1;
}
description { state: "selected_single" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 255;
+ color_class: "/bg/selected/segmentcontrol/item";
visible: 1;
}
description { state: "selected_left" 0.0;
- inherit: "default" 0.0;
- color: 51 153 255 255;
+ inherit: "selected_single" 0.0;
visible: 1;
- rel2.offset: -2 -1;
}
description { state: "selected_right" 0.0;
- inherit: "default" 0.0;
- color: 51 153 255 255;
+ inherit: "selected_single" 0.0;
visible: 1;
- rel1.offset: 1 0;
}
description { state: "selected_middle" 0.0;
- inherit: "default" 0.0;
- color: 51 153 255 255;
+ inherit: "selected_single" 0.0;
visible: 1;
- rel1.offset: 1 0;
- rel2.offset: -2 -1;
}
}
part { name: "disabler"; type: RECT;
description { state: "default" 0.0;
rel.to: "segment";
- color: 64 64 64 255;
+ color_class: "/bg/disabled/segmentcontrol/item";
visible: 0;
}
description { state: "disabled" 0.0;
@@ -114,11 +93,11 @@ group { name: "elm/segment_control/item/default";
part { name: "icon_disabler"; type: RECT;
description { state: "default" 0.0;
rel.to: "segment";
- color: 255 255 255 255;
+ 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: "elm.swallow.icon"; type: SWALLOW;
@@ -159,25 +138,23 @@ group { name: "elm/segment_control/item/default";
rel1.relative: 1.0 0.0;
rel1.offset: 4 4;
rel2.offset: -5 -5;
- color: 160 160 160 255;
- text {
- font: FN;
- size: 10;
+ color_class: "/fg/normal/segmentcontrol/item";
+ text { font: FN; size: 10;
min: 0 1;
text_class: "button";
}
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/segmentcontrol/item";
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/selected/segmentcontrol/item";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 96 96 96 255;
+ color_class: "/fg/disabled/segmentcontrol/item";
}
}
}
--
