[EGIT] [core/efl] master 01/01: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=abd6947e8bbb48575fd2446916b76fcda254511f
commit abd6947e8bbb48575fd2446916b76fcda254511f
Author: Carsten Haitzler
Date: Sun Aug 8 17:30:45 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index e9b66c82b7..c778b72955 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -75,6 +75,9 @@ color_classes {
color: 255 255 255 255; }
color_class { name: "/fg/normal/naviframe/top/overlap";
color: 255 255 255 200; }
+///
+ color_class { name: "/fg/normal/layout/content-back/title";
+ color: 255 255 255 255; }
///
color_class { name: "/fg/normal/menu/title";
color: 255 255 255 255; }
--
[EGIT] [core/efl] master 01/08: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=36ae2aa85b72b8fff49c752dcb650c008032e97a
commit 36ae2aa85b72b8fff49c752dcb650c008032e97a
Author: Carsten Haitzler
Date: Sun Aug 8 15:08:44 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 7 +
data/elementary/themes/edc/elm/panes.edc | 247 +--
2 files changed, 206 insertions(+), 48 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 8f5ea4ceec..bca6cfe6f9 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -83,6 +83,13 @@ color_classes {
///
color_class { name: "/fg/normal/color/cursor";
color: 255 255 255 192; }
+///
+ color_class { name: "/fg/normal/panes/flush";
+ color: 51 163 255 255; }
+ color_class { name: "/fg/normal/panes/fold/arrow";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/pressed/panes/fold/arrow";
+ color: 220 220 220 255; }
///
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
diff --git a/data/elementary/themes/edc/elm/panes.edc
b/data/elementary/themes/edc/elm/panes.edc
index bdd1d87e59..bce983cbf4 100644
--- a/data/elementary/themes/edc/elm/panes.edc
+++ b/data/elementary/themes/edc/elm/panes.edc
@@ -75,6 +75,7 @@ group { name: "elm/panes/vertical/default";
}
}
part { name: "elm.bar"; type: SPACER;
+ scale: 1;
dragable { confine: "sub_whole";
x: 1 1 1;
y: 0 0 0;
@@ -88,15 +89,20 @@ group { name: "elm/panes/vertical/default";
}
}
part { name: "dots"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
FIXED_SIZE(8, 24)
image.normal: "pane_handle_v.png";
-fill.smooth: 0;
rel.to: "elm.bar";
-color: 160 160 160 255;
+color_class: "/fg/normal/panes/handle";
+ }
+ description { state: "pressed" 0.0;
+inherit: "default" 0.0;
+color_class: "/fg/pressed/panes/handle";
}
}
part { name: "elm.swallow.event"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
visible: 0;
min: PANEMIN PANEMIN2;
@@ -105,6 +111,7 @@ group { name: "elm/panes/vertical/default";
}
}
part { name: "bar"; type: RECT;
+ scale: 1;
dragable.events: "elm.bar";
description { state: "default" 0.0;
min: PANEMIN PANEWID;
@@ -112,7 +119,7 @@ group { name: "elm/panes/vertical/default";
fixed: 1 1;
rel1.to_x: "elm.swallow.event";
rel2.to_x: "elm.swallow.event";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
@@ -121,12 +128,22 @@ group { name: "elm/panes/vertical/default";
}
}
programs {
- program {signal: "mouse,down,1"; source: "bar"; // for "press" smart
callback
+ program { signal: "mouse,down,1"; source: "bar"; // for "press" smart
callback
action: SIGNAL_EMIT "elm,action,press" "elm";
}
program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart
callback
action: SIGNAL_EMIT "elm,action,unpress" "elm";
}
+ program { name: "bar_down";
+ signal: "mouse,down,1"; source: "bar";
+ action: STATE_SET "pressed" 0.0;
+ target: "dots";
+ }
+ program { name: "bar_up";
+ signal: "mouse,up,1"; source: "bar";
+ action: STATE_SET "default" 0.0;
+ target: "dots";
+ }
program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked"
smart callback
action: SIGNAL_EMIT "elm,action,click" "elm";
}
@@ -206,6 +223,7 @@ group { name: "elm/panes/horizontal/default";
}
}
part { name: "elm.bar"; type: SPACER;
+ scale: 1;
dragable { confine: "sub_whole";
x: 0 0 0;
y: 1 1 1;
@@ -219,12 +237,17 @@ group { name: "elm/panes/horizontal/default";
}
}
part { name: "dots"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
FIXED_SIZE(24, 8)
image.normal: "pane_handle_h.png";
fill.smooth: 0;
rel.to: "elm.bar";
-color: 160 160 160 255;
+color_class: "/fg/normal/panes/handle";
+ }
+ description { state: "pressed" 0.0;
+inherit: "default" 0.0;
+color_class:
[EGIT] [core/efl] master 06/08: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=aeb78842df91c3bcd4356643b7364f9916fe5ba5
commit aeb78842df91c3bcd4356643b7364f9916fe5ba5
Author: Carsten Haitzler
Date: Sun Aug 8 17:04:19 2021 +0100
elm theme - more cc work
---
data/elementary/themes/edc/elm/menu.edc | 61 +
1 file changed, 32 insertions(+), 29 deletions(-)
diff --git a/data/elementary/themes/edc/elm/menu.edc
b/data/elementary/themes/edc/elm/menu.edc
index 6a4ee992c2..05789161f4 100644
--- a/data/elementary/themes/edc/elm/menu.edc
+++ b/data/elementary/themes/edc/elm/menu.edc
@@ -6,7 +6,7 @@ group { name: "elm/menu/item/default";
parts {
part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-color: 40 40 40 255;
+color_class: "/bg/selected/menu/item/base";
visible: 0;
}
description { state: "active" 0.0;
@@ -59,7 +59,7 @@ group { name: "elm/menu/item/default";
rel2.to_x: "arrowspace";
rel2.offset: -5 -5;
rel2.relative: 0.0 1.0;
-color: 160 160 160 255;
+color_class: "/fg/normal/menu/item/text";
offscale;
text { font: FN; size: 10;
min: 1 1;
@@ -70,17 +70,17 @@ group { name: "elm/menu/item/default";
}
description { state: "active" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color_class: "/fg/selected/menu/item/text";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
-color: 96 96 96 255;
+color_class: "/fg/disabled/menu/item/text";
}
}
part { name: "event"; type: RECT;
ignore_flags: ON_HOLD;
description { state: "default" 0.0;
-color: 255 255 255 0;
+color: 0 0 0 0; // no cc
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
@@ -89,11 +89,11 @@ group { name: "elm/menu/item/default";
}
part { name: "disabler"; type: RECT;
description { state: "default" 0.0;
-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 128;
+color: 255 255 255 64; // no cc
}
}
}
@@ -167,19 +167,18 @@ group { name: "elm/menu/item/default";
group { name: "elm/menu/item_with_submenu/default";
inherit: "elm/menu/item/default";
// alias: "elm/menu/main_menu_submenu/default";
- images.image: "menu_submenu.png" COMP;
parts {
part { name: "arrow";
description { state: "default" 0.0;
min: 15 15;
max: 15 15;
rel.to: "arrowspace";
-image.normal: "menu_submenu.png";
-color: 160 160 160 255;
+image.normal: "i-arrow-r";
+color_class: "/fg/normal/menu/item/arrow";
}
description { state: "active" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color_class: "/fg/selected/menu/item/arrow";
}
}
}
@@ -203,11 +202,13 @@ group { name: "elm/menu/item_with_submenu/default";
group { name: "elm/menu/separator/default";
parts {
part { name: "separator"; type: RECT;
+ scale;
description { state: "default" 0.0;
rel1.offset: 0 10;
rel2.offset: -1 -11;
min: 0 1;
-color: 72 72 72 255;
+color_class: "/fg/normal/separator/menu";
+offscale;
}
}
}
@@ -221,7 +222,7 @@ group { name: "elm/menu/main_menu_submenu/default";
parts {
part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-color: 40 40 40 255;
+color_class: "/bg/selected/menu/item/base";
visible: 0;
}
description { state: "active" 0.0;
@@ -273,7 +274,7 @@ group { name: "elm/menu/main_menu_submenu/default";
rel2.to_x: "arrowspace";
rel2.offset: -5 -5;
rel2.relative: 0.0 1.0;
-color: 160 160 160 255;
+color_class: "/fg/normal/menu/item/text";
offscale;
text { font: FN; size: 10;
min: 1 1;
@@ -284,17 +285,17 @@ group { name: "elm/menu/main_menu_submenu/default";
}
description { state: "active" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color_class: "/fg/selected/menu/item/text";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
-color: 96 96 96 255;
+color_class: "/fg/disabled/menu/item/text";
}
}
[EGIT] [core/efl] master 04/08: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4734726a611c47f1b753554dcceb6c8c8785146e
commit 4734726a611c47f1b753554dcceb6c8c8785146e
Author: Carsten Haitzler
Date: Sun Aug 8 16:12:48 2021 +0100
elm theme - more cc
---
.../elementary/themes/edc/elm/multibuttonentry.edc | 33 --
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/data/elementary/themes/edc/elm/multibuttonentry.edc
b/data/elementary/themes/edc/elm/multibuttonentry.edc
index 5ee16d5495..3e7ee85419 100644
--- a/data/elementary/themes/edc/elm/multibuttonentry.edc
+++ b/data/elementary/themes/edc/elm/multibuttonentry.edc
@@ -5,7 +5,7 @@ group { name: "elm/multibuttonentry/base/default";
parts {
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
}
part { name: "elm.swallow.background"; type: SWALLOW;
@@ -29,7 +29,7 @@ group { name: "elm/multibuttonentry/label/default";
part { name: "elm.text"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
-color: 160 160 160 255;
+color_class: "/fg/normal/multibuttonentry/text";
text { font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
@@ -51,7 +51,7 @@ group { name: "elm/multibuttonentry/guidetext/default";
description { state: "default" 0.0;
rel1.offset: 4 4;
rel2.offset: -5 -5;
-color: 80 80 80 255;;
+color_class: "/fg/normal/multibuttonentry/text/guide";
text { font: FNBD; size: 10;
min: 0 1;
align: 0.0 0.5;
@@ -65,7 +65,7 @@ group { name: "elm/multibuttonentry/guidetext/default";
group { name: "elm/multibuttonentry/btn/default";
styles {
style { name: "multibuttonentry_textblock_style";
- base: "font="FN" align=0.5 font_size=10 color=#
text_class=multibuttonentry_item ellipsis=1.0";
+ base: "font="FN" align=0.5 font_size=10 color=#fff
text_class=multibuttonentry_item ellipsis=1.0"; // no cc for color
tag: "br" "\n";
tag: "ps" "ps";
tag: "hilight" "+ font="FNBD;
@@ -82,14 +82,14 @@ group { name: "elm/multibuttonentry/btn/default";
part { name: "base"; type: RECT;
scale: 1;
description { state: "default" 0.0;
-color: 0 0 0 64;
+color_class: "/bg/normal/multibuttonentry/button";
rel1.offset: 2 2;
rel2.offset: -3 -3;
offscale;
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
-color: 0 0 0 192;
+color_class: "/bg/pressed/multibuttonentry/button";
}
}
part { name: "glow"; type: RECT; mouse_events: 0;
@@ -98,7 +98,7 @@ group { name: "elm/multibuttonentry/btn/default";
rel1.offset: 0 -1;
rel1.relative: 0.0 1.0;
align: 0.5 1.0;
-color: 51 153 255 255;
+color_class: "/bg/selected/multibuttonentry/button";
visible: 0;
}
description { state: "focused" 0.0;
@@ -111,17 +111,18 @@ group { name: "elm/multibuttonentry/btn/default";
}
}
part { name: "close"; mouse_events: 0;
+ scale;
description { state: "default" 0.0;
image.normal: "i-close";
rel.to: "del";
min: 15 15;
max: 15 15;
fixed: 1 1;
-color: 160 160 160 255;
+color_class: "/fg/normal/multibuttonentry/button/delete";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color_class: "/fg/pressed/multibuttonentry/button/delete";
}
}
part { name: "del"; type: RECT;
@@ -135,7 +136,7 @@ group { name: "elm/multibuttonentry/btn/default";
rel1.relative: 1.0 0.0;
rel1.offset: -5 4;
rel2.offset: -5 -5;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
offscale;
}
}
@@ -168,15 +169,15 @@ group { name: "elm/multibuttonentry/btn/default";
align: 0.0 0.5;
text_class: "multibuttonentry_item_text";
}
-color: 160 160 160 255;
+color_class: "/fg/normal/multibuttonentry/text/button";
}
description { state: "pressed" 0.0;
inherit: "default";
-color: 255 255 255 255;
+color_class: "/fg/pressed/multibuttonentry/text/button";
}
description { state: "disabled" 0.0;
inherit: "default";
-color: 80 80 80 255;
+color_class: "/fg/disabled/multibuttonentry/text/button";
}
}
}
@@ -252,7 +253,7
[EGIT] [core/efl] master 02/08: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f8d9fe7a6668a8e04a325cb5b09f1d9b56e5fba3
commit f8d9fe7a6668a8e04a325cb5b09f1d9b56e5fba3
Author: Carsten Haitzler
Date: Sun Aug 8 15:28:28 2021 +0100
elm theme - more cc
---
data/elementary/themes/edc/elm/panel.edc | 67 +---
1 file changed, 27 insertions(+), 40 deletions(-)
diff --git a/data/elementary/themes/edc/elm/panel.edc
b/data/elementary/themes/edc/elm/panel.edc
index 926b45da8e..cb61d5caf8 100644
--- a/data/elementary/themes/edc/elm/panel.edc
+++ b/data/elementary/themes/edc/elm/panel.edc
@@ -47,17 +47,15 @@ group { name: "elm/scroller/panel/left/default";
type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
-rel1.to: "elm.panel_area";
-rel2.to: "elm.panel_area";
-color: 0 0 0 0;
+rel.to: "elm.panel_area";
+color: 0 0 0 0; // no cc
}
}
part { name: "bg";
type: RECT;
description { state: "default" 0.0;
-rel1.to: "elm.panel_area";
-rel2.to: "elm.panel_area";
-color: 64 64 64 255;
+rel.to: "elm.panel_area";
+color_class: "/bg/normal/panel";
visible: 0;
}
description { state: "visible" 0.0;
@@ -68,8 +66,7 @@ group { name: "elm/scroller/panel/left/default";
part { name: "elm.swallow.content";
type: SWALLOW;
description { state: "default" 0.0;
-rel1.to: "elm.panel_area";
-rel2.to: "elm.panel_area";
+rel.to: "elm.panel_area";
visible: 0;
}
description { state: "visible" 0.0;
@@ -139,17 +136,15 @@ group { name: "elm/scroller/panel/right/default";
type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
-rel1.to: "elm.panel_area";
-rel2.to: "elm.panel_area";
-color: 0 0 0 0;
+rel.to: "elm.panel_area";
+color: 0 0 0 0; // no cc
}
}
part { name: "bg";
type: RECT;
description { state: "default" 0.0;
-rel1.to: "elm.panel_area";
-rel2.to: "elm.panel_area";
-color: 64 64 64 255;
+rel.to: "elm.panel_area";
+color_class: "/bg/normal/panel";
visible: 0;
}
description { state: "visible" 0.0;
@@ -160,8 +155,7 @@ group { name: "elm/scroller/panel/right/default";
part { name: "elm.swallow.content";
type: SWALLOW;
description { state: "default" 0.0;
-rel1.to: "elm.panel_area";
-rel2.to: "elm.panel_area";
+rel.to: "elm.panel_area";
visible: 0;
}
description { state: "visible" 0.0;
@@ -231,17 +225,15 @@ group { name: "elm/scroller/panel/top/default";
type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
-rel1.to: "elm.panel_area";
-rel2.to: "elm.panel_area";
-color: 0 0 0 0;
+rel.to: "elm.panel_area";
+color: 0 0 0 0; // no cc
}
}
part { name: "bg";
type: RECT;
description { state: "default" 0.0;
-rel1.to: "elm.panel_area";
-rel2.to: "elm.panel_area";
-color: 64 64 64 255;
+rel.to: "elm.panel_area";
+color_class: "/bg/normal/panel";
visible: 0;
}
description { state: "visible" 0.0;
@@ -252,8 +244,7 @@ group { name: "elm/scroller/panel/top/default";
part { name: "elm.swallow.content";
type: SWALLOW;
description { state: "default" 0.0;
-rel1.to: "elm.panel_area";
-rel2.to: "elm.panel_area";
+rel.to: "elm.panel_area";
visible: 0;
}
description { state: "visible" 0.0;
@@ -315,13 +306,13 @@ group { name: "elm/scroller/panel/bottom/default";
part { name: "access.outline"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
rel.to: "elm.panel_area";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
}
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
rel.to: "elm.panel_area";
-color: 64 64 64 255;
+color_class: "/bg/normal/panel";
visible: 0;
}
description { state: "visible" 0.0;
@@ -369,13 +360,14 @@ group { name: "elm/panel/left/default";
description { state: "default" 0.0;
rel.to: "base";
WIN_SHADOW_SMALL;
+color_class: "/shadow/normal/panel";
}
}
part { name: "glow"; type: RECT; mouse_events: 0;
scale: 1;
description { state: "default"
[EGIT] [core/efl] master 05/08: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bfe0d5b09acf533df6a35be8c92bc61319ad2a88
commit bfe0d5b09acf533df6a35be8c92bc61319ad2a88
Author: Carsten Haitzler
Date: Sun Aug 8 16:25:38 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 9 +
data/elementary/themes/edc/elm/multibuttonentry.edc | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 5864f842d7..e9b66c82b7 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -59,6 +59,15 @@ color_classes {
color: 255 255 255 255; }
color_class { name: "/fg/normal/photo/base";
color: 48 48 48 255; }
+///
+ color_class { name: "/fg/normal/multibuttonentry/text/guide";
+ color: 80 80 80 255; }
+ color_class { name: "/bg/normal/multibuttonentry/button";
+ color: 0 0 0 64; }
+ color_class { name: "/bg/pressed/multibuttonentry/button";
+ color: 0 0 0 200; }
+ color_class { name: "/bg/selected/multibuttonentry/button/bar";
+ color: 51 153 255 255; }
///
color_class { name: "/bg/normal/naviframe/top";
color: 32 32 32 255; }
diff --git a/data/elementary/themes/edc/elm/multibuttonentry.edc
b/data/elementary/themes/edc/elm/multibuttonentry.edc
index 3e7ee85419..d8be64b85b 100644
--- a/data/elementary/themes/edc/elm/multibuttonentry.edc
+++ b/data/elementary/themes/edc/elm/multibuttonentry.edc
@@ -98,7 +98,7 @@ group { name: "elm/multibuttonentry/btn/default";
rel1.offset: 0 -1;
rel1.relative: 0.0 1.0;
align: 0.5 1.0;
-color_class: "/bg/selected/multibuttonentry/button";
+color_class: "/bg/selected/multibuttonentry/button/bar";
visible: 0;
}
description { state: "focused" 0.0;
--
[EGIT] [core/efl] master 08/08: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0b596ea6e89a9af0382eca5d1de1a396938385dd
commit 0b596ea6e89a9af0382eca5d1de1a396938385dd
Author: Carsten Haitzler
Date: Sun Aug 8 17:27:30 2021 +0100
elm theme - more cc
---
data/elementary/themes/edc/elm/inwin.edc | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/data/elementary/themes/edc/elm/inwin.edc
b/data/elementary/themes/edc/elm/inwin.edc
index df9d1c8527..80cc451cf7 100644
--- a/data/elementary/themes/edc/elm/inwin.edc
+++ b/data/elementary/themes/edc/elm/inwin.edc
@@ -1,29 +1,29 @@
group { name: "elm/win/inwin/default";
- images.image: "win_shadow.png" COMP;
+ images.image: "win_shad_flat.png" COMP;
parts {
part { name: "bg"; type: RECT; mouse_events: 1;
description { state: "default" 0.0;
-color: 0 0 0 0;
+color_class: "dim/normal/inwin";
+color: 255 255 255 0; // no cc
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
-color: 0 0 0 128;
+color: 255 255 255 255; // no cc
}
}
- part { name: "shadow"; mouse_events: 0;
- scale: 1;
+ part { name: "shadow"; type: RECT;
description { state: "default" 0.0;
-rel.to: "base";
-WIN_SHADOW_SMALL;
+rel.to: "_sh1";
+color_class: "/shadow/normal/inwin";
}
}
+ WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25);
part { name: "base"; type: RECT;
scale: 1;
description { state: "default" 0.0;
-color: 64 64 64 255;
+color_class: "/bg/normal/inwin";
offscale;
-rel1.to: "elm.swallow.content";
-rel2.to: "elm.swallow.content";
+rel.to: "elm.swallow.content";
rel1.offset: -8 -8;
rel2.offset: 7 7;
}
--
[EGIT] [core/efl] master 03/08: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3cbf40c48b6a210376cae24d2584bad41f08ea97
commit 3cbf40c48b6a210376cae24d2584bad41f08ea97
Author: Carsten Haitzler
Date: Sun Aug 8 15:49:01 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 10 ++
data/elementary/themes/edc/elm/naviframe.edc | 12 ++--
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index bca6cfe6f9..5864f842d7 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -59,6 +59,13 @@ color_classes {
color: 255 255 255 255; }
color_class { name: "/fg/normal/photo/base";
color: 48 48 48 255; }
+///
+ color_class { name: "/bg/normal/naviframe/top";
+ color: 32 32 32 255; }
+ color_class { name: "/fg/normal/naviframe/text/title";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/naviframe/top/overlap";
+ color: 255 255 255 200; }
///
color_class { name: "/fg/normal/menu/title";
color: 255 255 255 255; }
@@ -90,6 +97,9 @@ color_classes {
color: 255 255 255 255; }
color_class { name: "/fg/pressed/panes/fold/arrow";
color: 220 220 220 255; }
+///
+ color_class { name: "/fg/normal/panel/arrow";
+ color: 255 255 255 255; }
///
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
diff --git a/data/elementary/themes/edc/elm/naviframe.edc
b/data/elementary/themes/edc/elm/naviframe.edc
index d67333b561..6ae6e65b0b 100644
--- a/data/elementary/themes/edc/elm/naviframe.edc
+++ b/data/elementary/themes/edc/elm/naviframe.edc
@@ -238,7 +238,7 @@ group { name: "elm/naviframe/item/basic/default";
scale: 1;
clip_to: "top_clip";
description { state: "default" 0.0;
-color: 32 32 32 255;
+color_class: "/bg/normal/naviframe/top";
rel1.to: "base";
rel2.to_x: "base";
rel2.to_y: "bottom";
@@ -254,7 +254,7 @@ group { name: "elm/naviframe/item/basic/default";
clip_to: "clip";
description { state: "default" 0.0;
fixed: 1 1;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
rel.to: "top";
}
}
@@ -262,7 +262,7 @@ group { name: "elm/naviframe/item/basic/default";
scale: 1;
clip_to: "elements_clip";
description { state: "default" 0.0;
-color: 255 255 255 255;
+color_class: "/fg/normal/naviframe/text/title";
rel1.offset: 4 14;
rel1.to_x: "base";
rel1.to_y: "top";
@@ -287,7 +287,7 @@ group { name: "elm/naviframe/item/basic/default";
scale: 1;
clip_to: "elements_clip";
description { state: "default" 0.0;
-color: 160 160 160 255;
+color_class: "/fg/normal/naviframe/text/subtitle";
rel1.to_x: "base";
rel1.to_y: "top";
rel1.relative: 0.0 1.0;
@@ -391,7 +391,7 @@ group { name: "elm/naviframe/item/basic/default";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 0;
+color: 255 255 255 0; // no cc
visible: 0;
}
description { state: "next" 0.0;
@@ -579,7 +579,7 @@ group { name: "elm/naviframe/item/overlap/default";
}
part { name: "top_clip";
description { state: "default" 0.0;
-color: 255 255 255 224;
+color_class: "/fg/normal/naviframe/top/overlap";
}
}
}
--
[EGIT] [core/efl] master 07/08: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=76e61a701c43bce29ee44d5bbf207dfb009182a7
commit 76e61a701c43bce29ee44d5bbf207dfb009182a7
Author: Carsten Haitzler
Date: Sun Aug 8 17:18:18 2021 +0100
elm theme - more cc
---
data/elementary/themes/edc/elm/layout.edc | 71 +--
data/elementary/themes/edc/elm/map.edc| 11 ++---
2 files changed, 35 insertions(+), 47 deletions(-)
diff --git a/data/elementary/themes/edc/elm/layout.edc
b/data/elementary/themes/edc/elm/layout.edc
index a2e0fec9eb..def5df4256 100644
--- a/data/elementary/themes/edc/elm/layout.edc
+++ b/data/elementary/themes/edc/elm/layout.edc
@@ -6,7 +6,6 @@ group { name: "elm/layout/application/content-back";
rel1 {
to_y: "title_clipper";
relative: 0.0 1.0;
- offset: -1 1;
}
}
}
@@ -34,43 +33,40 @@ group { name: "elm/layout/application/content-back";
part { name: "back"; type: EXTERNAL;
source: "elm/button";
clip_to: "back_clipper";
+ scale;
description { state: "default" 0.0;
align: 0.0 0.0;
fixed: 1 1;
rel1 {
relative: 0.0 0.0;
- offset: 0 1;
+ offset: 0 0;
}
rel2 {
relative: 0.0 0.0;
offset: 50 32;
}
params.string: "label" "Back";
+offscale;
}
}
programs {
- program {
-signal: "clicked"; source: "back";
+ program { signal: "clicked"; source: "back";
action: SIGNAL_EMIT "elm,action,back" "elm";
}
- program {
-signal: "elm,back,hide"; source: "elm";
+ program { signal: "elm,back,hide"; source: "elm";
action: STATE_SET "hidden" 0.0;
target: "back_clipper";
}
- program {
-signal: "elm,back,show"; source: "elm";
+ program { signal: "elm,back,show"; source: "elm";
action: STATE_SET "default" 0.0;
target: "back_clipper";
}
- program {
-signal: "elm,title,hide"; source: "elm";
+ program { signal: "elm,title,hide"; source: "elm";
action: STATE_SET "hidden" 0.0;
transition: LINEAR 0.1;
target: "title_clipper";
}
- program {
-signal: "elm,title,show"; source: "elm";
+ program { signal: "elm,title,show"; source: "elm";
action: STATE_SET "default" 0.0;
target: "title_clipper";
}
@@ -90,10 +86,10 @@ group { name: "elm/layout/application/content-back";
}
}
part { name: "elm.text.title"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
clip_to: "title_clipper";
description { state: "default" 0.0;
+offscale;
rel1 {
to_x: "back";
relative: 1.0 0.0;
@@ -105,7 +101,7 @@ group { name: "elm/layout/application/content-back";
relative: 0.0 1.0;
offset: -3 -1;
}
-color: FN_COL_DEFAULT;
+color_class: "/fg/normal/layout/content-back/title";
text { font: FNBD; size: 10;
}
}
@@ -140,6 +136,7 @@ group { name: "elm/layout/application/content-back-next";
part { name: "back"; type: EXTERNAL;
source: "elm/button";
clip_to: "back_clipper";
+ scale;
description { state: "default" 0.0;
align: 0.0 0.0;
fixed: 1 1;
@@ -152,6 +149,7 @@ group { name: "elm/layout/application/content-back-next";
offset: 50 32;
}
params.string: "label" "Back";
+offscale;
}
}
part { name: "back_clipper"; type: RECT;
@@ -166,6 +164,7 @@ group { name: "elm/layout/application/content-back-next";
part { name: "next"; type: EXTERNAL;
source: "elm/button";
clip_to: "next_clipper";
+ scale;
description { state: "default" 0.0;
align: 1.0 0.0;
fixed: 1 1;
@@ -178,6 +177,7 @@ group { name: "elm/layout/application/content-back-next";
offset: -1 32;
}
params.string: "label" "Next";
+offscale;
}
}
part { name: "next_clipper"; type: RECT;
@@ -190,48 +190,39 @@ group { name: "elm/layout/application/content-back-next";
}
}
programs {
- program {
-signal: "clicked"; source: "back";
+ program { signal: "clicked"; source: "back";
action: SIGNAL_EMIT "elm,action,back" "elm";
}
- program {
-signal: "elm,title,hide"; source: "elm";
+ program { signal: "elm,title,hide"; source: "elm";
