[EGIT] [core/efl] master 04/05: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e1052fab4cacaacdf187101b0c38b1ddb4459090
commit e1052fab4cacaacdf187101b0c38b1ddb4459090
Author: Carsten Haitzler
Date: Tue Aug 17 18:50:36 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 3 +++
data/elementary/themes/edc/elm/focus.edc | 28 ++--
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 4b6b50d8bd..b6ff67d783 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -304,6 +304,9 @@ color_classes {
color: 51 153 255 255; }
color_class { name: "/fg/normal/progress/text/status";
color: 255 255 255 255; }
+///
+ color_class { name: "/bg/selected/focus/hilight";
+ color: 255 255 255 255; }
///
color_class { name: "/bg/normal/entry";
color: 48 48 48 255; }
diff --git a/data/elementary/themes/edc/elm/focus.edc
b/data/elementary/themes/edc/elm/focus.edc
index 305cc5c3bd..aee4058075 100644
--- a/data/elementary/themes/edc/elm/focus.edc
+++ b/data/elementary/themes/edc/elm/focus.edc
@@ -80,12 +80,12 @@ group { name: "elm/focus_highlight/top/default";
rel1.offset: -999 -999;
rel2.relative: 2.0 2.0;
rel2.offset: 999 999;
-color: 255 255 255 0;
+color: 255 255 255 0; // no cc
visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color: 255 255 255 255; // no cc
visible: 1;
}
}
@@ -94,13 +94,13 @@ group { name: "elm/focus_highlight/top/default";
scale: 1;
description { state: "default" 0.0;
rel.to: "base";
-color: 51 153 255 255;
+color_class: "/bg/selected/focus";
rel2.relative: 1.0 0.0;
min: 4 4;
}
description { state: "hi" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color_class: "/bg/selected/focus/hilight";
}
}
part { name: "topl"; type: RECT;
@@ -108,7 +108,7 @@ group { name: "elm/focus_highlight/top/default";
scale: 1;
description { state: "default" 0.0;
rel.to: "top";
-color: 51 153 255 255;
+color_class: "/bg/selected/focus";
rel1.relative: 0.0 1.0;
rel2.relative: 0.0 1.0;
align: 0.0 0.0;
@@ -116,7 +116,7 @@ group { name: "elm/focus_highlight/top/default";
}
description { state: "hi" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color_class: "/bg/selected/focus/hilight";
}
}
part { name: "topr"; type: RECT;
@@ -124,7 +124,7 @@ group { name: "elm/focus_highlight/top/default";
scale: 1;
description { state: "default" 0.0;
rel.to: "top";
-color: 51 153 255 255;
+color_class: "/bg/selected/focus";
rel1.relative: 1.0 1.0;
rel2.relative: 1.0 1.0;
align: 1.0 0.0;
@@ -132,7 +132,7 @@ group { name: "elm/focus_highlight/top/default";
}
description { state: "hi" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color_class: "/bg/selected/focus/hilight";
}
}
part { name: "bot"; type: RECT;
@@ -140,13 +140,13 @@ group { name: "elm/focus_highlight/top/default";
scale: 1;
description { state: "default" 0.0;
rel.to: "base";
-color: 51 153 255 255;
+color_class: "/bg/selected/focus";
rel1.relative: 0.0 1.0;
min: 4 4;
}
description { state: "hi" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color_class: "/bg/selected/focus/hilight";
}
}
part { name: "botl"; type: RECT;
@@ -154,7 +154,7 @@ group { name: "elm/focus_highlight/top/default";
scale: 1;
description { state: "default" 0.0;
rel.to: "bot";
-color: 51 153 255 255;
+color_class: "
[EGIT] [core/efl] master 01/05: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f123f057a7ef4c8f9863dffc55b25f5f44c1cd1a
commit f123f057a7ef4c8f9863dffc55b25f5f44c1cd1a
Author: Carsten Haitzler
Date: Tue Aug 17 18:05:05 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 5 ++-
data/elementary/themes/edc/elm/hover.edc | 52 +---
2 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 3b88607e54..29693222b8 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -39,7 +39,6 @@ color_tree {
":selected" {
"/bg/selected";
"/fg/normal/panes/flush";
- "/bg/selected/multibuttonentry/button/bar";
}
}
@@ -129,6 +128,8 @@ color_classes {
color: 0 0 0 200; }
color_class { name: "/dim-alt/disabled";
color: 0 0 0 80; }
+ color_class { name: "/dim/normal/hover";
+ color: 0 0 0 64; }
///
color_class { name: "/bg/normal/popup";
color: 48 48 48 255; }
@@ -450,6 +451,8 @@ color_classes {
color_class { name: "/fg/normal/desklock/fprint/fail";
color: 255 153 51 255; }
///
+ color_class { name: "/bg/normal/hoversel/menu";
+ color: 96 96 96 255; }
color_class { name: "/bg/normal/hoversel/button";
color: 96 96 96 255; }
color_class { name: "/bg/pressed/hoversel/button";
diff --git a/data/elementary/themes/edc/elm/hover.edc
b/data/elementary/themes/edc/elm/hover.edc
index 158202acd1..264f7975c1 100644
--- a/data/elementary/themes/edc/elm/hover.edc
+++ b/data/elementary/themes/edc/elm/hover.edc
@@ -25,12 +25,12 @@ group { name: "elm/hover/base/default";
}
part { name: "base"; type: RECT; mouse_events: 1;
description { state: "default" 0.0;
-color: 0 0 0 64;
+color_class: "/dim/normal/hover";
}
}
part { name: "box"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
rel1.to: "elm.swallow.size";
rel1.offset: -2 -2;
rel2.to: "elm.swallow.size";
@@ -189,11 +189,12 @@ group { name: "elm/hover/base/popout";
}
part { name: "base"; type: RECT;
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 255 255 255 0; // no cc
+color_class: "/dim/normal/hover";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
-color: 0 0 0 64;
+color: 255 255 255 255; // no cc
}
}
part { name: "leftclip"; type: RECT;
@@ -210,10 +211,13 @@ group { name: "elm/hover/base/popout";
visible: 0;
rel.to: "left";
WIN_SHADOW_ANGLE_SMALL("shad_angle_l.png");
+color_class: "/shadow/normal/hover";
+color: 255 255 255 0; // no cc
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
+color: 255 255 255 255; // no cc
}
}
part { name: "shad_right"; nomouse;
@@ -223,10 +227,13 @@ group { name: "elm/hover/base/popout";
visible: 0;
rel.to: "right";
WIN_SHADOW_ANGLE_SMALL("shad_angle_r.png");
+color_class: "/shadow/normal/hover";
+color: 255 255 255 0; // no cc
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
+color: 255 255 255 255; // no cc
}
}
part { name: "shad_top"; nomouse;
@@ -236,10 +243,13 @@ group { name: "elm/hover/base/popout";
visible: 0;
rel.to: "top";
WIN_SHADOW_ANGLE_SMALL("shad_angle_t.png");
+color_class: "/shadow/normal/hover";
+color: 255 255 255 0; // no cc
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
+color: 255 255 255 255; // no cc
}
}
part { name: "shad_bottom"; nomouse;
@@ -249,10 +259,13 @@ group { name: "elm/hover/base/popout&q
[EGIT] [core/efl] master 03/05: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9eaa5ceca03d98e1c7aa571649c819becdbfb553
commit 9eaa5ceca03d98e1c7aa571649c819becdbfb553
Author: Carsten Haitzler
Date: Tue Aug 17 18:45:39 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc| 3 ++
data/elementary/themes/edc/elm/gengrid.edc | 59 --
2 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 931e32c1c8..4b6b50d8bd 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -400,6 +400,9 @@ color_classes {
color: 80 80 80 255; }
color_class { name: "/fg/normal/list/typebuf/text";
color: 255 255 255 255; }
+///
+ color_class { name: "/bg/normal/grid/item/thumb";
+ color: 255 255 255 255; }
///
color_class { name: "/bg/normal/frame/title";
color: 80 80 80 255; }
diff --git a/data/elementary/themes/edc/elm/gengrid.edc
b/data/elementary/themes/edc/elm/gengrid.edc
index 93293ad54e..aff83594be 100644
--- a/data/elementary/themes/edc/elm/gengrid.edc
+++ b/data/elementary/themes/edc/elm/gengrid.edc
@@ -12,7 +12,7 @@ group { name: "elm/gengrid/item/default/default";
#define BASEP() \
part { name: "event"; type: RECT; \
description { state: "default" 0.0; \
- color: 0 0 0 0; \
+ color: 0 0 0 0; /* no cc */ \
} \
description { state: "disabled" 0.0; \
inherit: "default" 0.0; \
@@ -21,10 +21,10 @@ group { name: "elm/gengrid/item/default/default";
} \
part { name: "base"; type: RECT; mouse_events: 0; \
description { state: "default" 0.0; \
- color: 64 64 64 255; \
+ color_class: "/bg/normal/grid/item"; \
} \
description { state: "odd" 0.0; \
- color: 56 56 56 255; \
+ color_class: "/bg-alt/normal/grid/item"; \
} \
} \
program { signal: "elm,state,odd"; source: "elm"; \
@@ -37,7 +37,7 @@ group { name: "elm/gengrid/item/default/default";
} \
part { name: "sel_base"; type: RECT; mouse_events: 0; \
description { state: "default" 0.0; \
- color: 51 153 255 255; \
+ color_class: "/bg/selected/grid/item"; \
visible: 0; \
} \
description { state: "selected" 0.0; \
@@ -64,7 +64,7 @@ group { name: "elm/gengrid/item/default/default";
#define TOPP() \
part { name: "event_block"; type: RECT; \
description { state: "default" 0.0; \
- color: 0 0 0 0; \
+ color: 0 0 0 0; /* no cc */ \
visible: 0; \
} \
description { state: "disabled" 0.0; \
@@ -91,7 +91,7 @@ group { name: "elm/gengrid/item/default/default";
rel1.relative: 0.0 1.0;
rel1.offset: 4 -5;
rel2.offset: -5 -5;
-color: 160 160 160 255;
+color_class: "/fg/normal/grid/item";
align: 0.5 1.0;
offscale;
text { font: FN; size: 10;
@@ -102,11 +102,11 @@ group { name: "elm/gengrid/item/default/default";
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color_class: "/fg/selected/grid/item";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
-color: 80 80 80 255;
+color_class: "/fg/disabled/grid/item";
}
}
program { signal: "elm,state,selected"; source: "elm";
@@ -135,11 +135,12 @@ group { name: "elm/gengrid/item/default/default";
rel2.to_y: "elm.swallow.pad";
rel2.relative: 1.0 0.0;
rel2.offset: -5 -5;
+color: 255 255 255 255; // no cc
offscale;
}
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.pad"; type: SWALLOW;
@@ -187,7 +188,7 @@ group { name: "elm/gengrid/item/default_style/default";
data.item: "texts" "elm.text";
data.item: "contents" "elm.swallow.icon elm.swallow.end";
styles.style {name: "gengrid_style";
- base: "font="FN"
[EGIT] [core/efl] master 02/05: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fd63d07fb92d6078c8feb6922926a3da581f08cd
commit fd63d07fb92d6078c8feb6922926a3da581f08cd
Author: Carsten Haitzler
Date: Tue Aug 17 18:21:35 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc| 4 +++-
data/elementary/themes/edc/elm/frame.edc | 19 ++-
data/elementary/themes/edc/elm/toolbar.edc | 2 +-
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 29693222b8..931e32c1c8 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -405,6 +405,8 @@ color_classes {
color: 80 80 80 255; }
color_class { name: "/fg/normal/frame/title";
color: 255 255 255 255; }
+ color_class { name: "/fg/normal/frame/separator";
+ color: 80 80 80 255; }
///
color_class { name: "/bg/normal/actionslider/base";
color: 0 0 0 64; }
@@ -587,7 +589,7 @@ color_classes {
///
color_class { name: "/bg/selected/toolbar/base";
color: 32 32 32 255; }
- color_class { name: "/fg/selected/toolbar/separator";
+ color_class { name: "/fg/normal/toolbar/separator";
color: 80 80 80 255; }
///
color_class { name: "/fg/normal/winlist/text/title";
diff --git a/data/elementary/themes/edc/elm/frame.edc
b/data/elementary/themes/edc/elm/frame.edc
index 66d3a79358..4414e0b988 100644
--- a/data/elementary/themes/edc/elm/frame.edc
+++ b/data/elementary/themes/edc/elm/frame.edc
@@ -83,7 +83,7 @@ group { name: "elm/frame/base/default";
}
part { name: "event"; type: RECT; ignore_flags: ON_HOLD;
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
rel1.to_y: "elm.text";
rel2.to_y: "elm.text";
}
@@ -166,7 +166,7 @@ group { name: "elm/frame/base/border";
parts {
part { name: "top_bg";
description { state: "default" 0.0;
-color: 32 32 32 255;
+color_class: "/bg/selected/titlebar";
}
}
part { name: "elm.text";
@@ -174,6 +174,7 @@ group { name: "elm/frame/base/border";
rel2.to_x: "close";
rel2.relative: 0.0 0.0;
min: 0 15;
+color_class: "/fg/selected/titlebar";
}
}
part { name: "close";
@@ -190,11 +191,11 @@ group { name: "elm/frame/base/border";
max: 15 15;
offscale;
image.normal: "i-close";
-color: 255 255 255 255;
+color_class: "/fg/selected/titlebar/buttons/close";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
-color: 220 220 220 255;
+color_class: "/fg/pressed/titlebar/buttons/close";
}
}
program { signal: "mouse,down,1"; source: "close";
@@ -216,7 +217,7 @@ group { name: "elm/frame/base/overlay";
parts {
part { name: "bg";
description { state: "default" 0.0;
-color: 0 0 0 160;
+color_class: "/dim/normal/frame-overlay";
}
}
}
@@ -227,7 +228,7 @@ group { name: "elm/frame/base/icon_overlay";
parts {
part { name: "bg";
description { state: "default" 0.0;
-color: 0 0 0 160;
+color_class: "/dim/normal/frame-overlay";
}
}
}
@@ -238,7 +239,7 @@ group { name: "elm/frame/base/border_overlay";
parts {
part { name: "bg";
description { state: "default" 0.0;
-color: 0 0 0 160;
+color_class: "/dim/normal/frame-overlay";
}
}
}
@@ -345,7 +346,7 @@ group { name: "elm/frame/base/outdent_top";
rel2.offset: -5 2;
rel2.relative: 1.0 0.0;
min: 0 1;
-color: 72 72 72 255;
+color_class: "/fg/normal/frame/separator";
offscale;
}
}
@@ -372,7 +373,7 @@ group { name: "elm/frame/base/outdent_bottom";
rel1.relative: 0.0 1.0;
rel2.offset: -5 -3;
min: 0 1;
-color: 72 72 72 255;
+color_class: "/fg/norm
[EGIT] [core/efl] master 05/05: elm theme - more cc work - now 70 percent done
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f2510d4a0804978ba26278de3baad726778a37dd
commit f2510d4a0804978ba26278de3baad726778a37dd
Author: Carsten Haitzler
Date: Tue Aug 17 18:57:08 2021 +0100
elm theme - more cc work - now 70 percent done
---
data/elementary/themes/edc/elm/clock.edc | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/data/elementary/themes/edc/elm/clock.edc
b/data/elementary/themes/edc/elm/clock.edc
index 05fcfc4baa..0167ce2af4 100644
--- a/data/elementary/themes/edc/elm/clock.edc
+++ b/data/elementary/themes/edc/elm/clock.edc
@@ -53,7 +53,7 @@ group { name: "elm/clock/flipdigit/default";
description { state: "default" 0.0;
visible: 0;
rel1.relative: 0.0 0.5;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
min: 20 20;
}
description { state: "visible" 0.0;
@@ -66,7 +66,7 @@ group { name: "elm/clock/flipdigit/default";
description { state: "default" 0.0;
visible: 0;
rel2.relative: 1.0 0.5;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
min: 20 20;
}
description { state: "visible" 0.0;
@@ -83,7 +83,7 @@ group { name: "elm/clock/flipdigit/default";
rel2.relative: 1.0 0.0;
aspect: (52/72) (52/72); aspect_preference: BOTH;
image.normal: "digit_0.png";
-color: 160 160 160 255;
+color_class: "/fg/normal/clock";
}
#define DIGIT_DESC(_DIGIT) \
description { state: _DIGIT 0.0; \
@@ -111,7 +111,7 @@ group { name: "elm/clock/flipdigit/default";
align: 0.5 0.0;
aspect: 1 1; aspect_preference: BOTH;
image.normal: "ic-arrow-u";
-color: 160 160 160 255;
+color_class: "/fg/normal/clock/arrow";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -126,7 +126,7 @@ group { name: "elm/clock/flipdigit/default";
align: 0.5 0.0;
aspect: 1 1; aspect_preference: BOTH;
image.normal: "ic-arrow-d";
-color: 160 160 160 255;
+color_class: "/fg/normal/clock/arrow";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -137,7 +137,7 @@ group { name: "elm/clock/flipdigit/default";
type: RECT;
description { state: "default" 0.0;
rel.to: "t";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
visible: 0;
}
description { state: "visible" 0.0;
@@ -149,7 +149,7 @@ group { name: "elm/clock/flipdigit/default";
type: RECT;
description { state: "default" 0.0;
rel.to: "b";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
visible: 0;
}
description { state: "visible" 0.0;
@@ -263,7 +263,7 @@ group { name: "elm/clock/flipampm/default";
max: _W _H; \
fixed: 1 1; \
image.normal: "digit_sep.png"; \
-color: 160 160 160 255; \
+color_class: "/fg/normal/clock/separator"; \
} \
}
@@ -318,7 +318,7 @@ group { name: "elm/clock/base/default";
part { name: "base"; type: RECT;
scale : 1;
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
visible: 0;
}
description { state: "visible" 0.0;
--
[EGIT] [core/efl] master 02/03: elm theme - more cc fixing
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6e692decf7ac4f5e3a389c2cf673d60374af3588
commit 6e692decf7ac4f5e3a389c2cf673d60374af3588
Author: Carsten Haitzler
Date: Tue Aug 17 13:55:01 2021 +0100
elm theme - more cc fixing
---
data/elementary/themes/colorclasses.edc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index d807a8450d..42adcbac2d 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -649,6 +649,8 @@ color_classes {
color: 51 153 255 255; }
color_class { name: "/fg/normal/gadgets/ibar/drop/arrow";
color: 51 153 255 255; }
+ color_class { name: "/fg/normal/gadgets/ibar/separator";
+ color: 80 80 80 255; }
///
color_class { name: "/fg/normal/gadgets/backlight/light/off";
color: 255 255 255 0; }
--
[EGIT] [core/efl] master 03/03: elm theme - fix cc for gadman move
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bb01e601fee96fc49a2a9ac1ea4749900bf56838
commit bb01e601fee96fc49a2a9ac1ea4749900bf56838
Author: Carsten Haitzler
Date: Tue Aug 17 15:06:33 2021 +0100
elm theme - fix cc for gadman move
---
data/elementary/themes/colorclasses.edc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 42adcbac2d..3b88607e54 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -633,7 +633,7 @@ color_classes {
// color: 160 160 160 255; }
///
color_class { name: "/bg/normal/gadgets/control/base";
- color: 51 153 255 255; }
+ color: 51 153 255 25; }
color_class { name: "/bg/normal/gadgets/control/outline";
color: 51 153 255 255; }
color_class { name: "/bg/selected/gadgets/control/outline";
--
[EGIT] [core/efl] master 01/03: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ebf4b945d66a79f099cb08ab2061fea430e70555
commit ebf4b945d66a79f099cb08ab2061fea430e70555
Author: Carsten Haitzler
Date: Mon Aug 16 16:58:38 2021 +0100
elm theme - more cc
---
data/elementary/themes/edc/connman.edc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/elementary/themes/edc/connman.edc
b/data/elementary/themes/edc/connman.edc
index 56dbdb7171..d8604c001d 100644
--- a/data/elementary/themes/edc/connman.edc
+++ b/data/elementary/themes/edc/connman.edc
@@ -66,7 +66,7 @@ group { name: "e/modules/connman/main";
}
description { state: "online" 0.0;
inherit: "default" 0.0;
-color_class: "/fg/selected/gadgets/connman/eth/connector";
+color_class: "/fg/normal/gadgets/connman/eth/connector";
}
}
///
--
[EGIT] [core/efl] master 01/01: edje cc lookup - fix to proper path fallback - mis-lookups fixed
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5a12ceaa7db21fa427612fdd715e3cf8a69813ac
commit 5a12ceaa7db21fa427612fdd715e3cf8a69813ac
Author: Carsten Haitzler
Date: Mon Aug 16 11:48:41 2021 +0100
edje cc lookup - fix to proper path fallback - mis-lookups fixed
---
src/lib/edje/edje_util.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index f4d2b4c57f..82f245f356 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -5828,15 +5828,15 @@ _edje_hash_find_helper(const Eina_Hash *hash, const
char *key)
buf = eina_strbuf_new();
-for (i = tokens_count - 2; i >= 0; i--)
+for (i = tokens_count - 1; i >= 0; i--)
{
for (j = 0; j < i; j++)
{
eina_strbuf_append(buf, tokens[j]);
eina_strbuf_append(buf, "/");
}
- eina_strbuf_append(buf, tokens[tokens_count - 1]);
-
+ if (i == 0) eina_strbuf_append(buf, "/");
+ eina_strbuf_append(buf, tokens[i]);
data = eina_hash_find(hash, eina_strbuf_string_get(buf));
if (data) break;
--
[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=9ef86222c8fe33a2fef9f7a145ebb22113ec51d1
commit 9ef86222c8fe33a2fef9f7a145ebb22113ec51d1
Author: Carsten Haitzler
Date: Sat Aug 14 21:33:04 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 11 ++
data/elementary/themes/edc/elm/index.edc | 57 +---
2 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index c3c30c267d..d807a8450d 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -33,6 +33,8 @@ color_tree {
"/fg/normal/gadgets/bluez/off";
"/fg/normal/gadgets/clock/digital/separator";
"/fg/normal/gadgets/clock/analog/hands/hours";
+ "/fg/normal/index/item/text";
+ "/fg-alt";
}
":selected" {
"/bg/selected";
@@ -121,6 +123,12 @@ color_classes {
color: 0 0 0 200; }
color_class { name: "/dim/disabled";
color: 0 0 0 80; }
+ color_class { name: "/dim-alt";
+ color: 0 0 0 160; }
+ color_class { name: "/dim-alt/pressed";
+ color: 0 0 0 200; }
+ color_class { name: "/dim-alt/disabled";
+ color: 0 0 0 80; }
///
color_class { name: "/bg/normal/popup";
color: 48 48 48 255; }
@@ -174,6 +182,9 @@ color_classes {
///
color_class { name: "/fg/normal/color/cursor";
color: 255 255 255 192; }
+///
+ color_class { name: "/fg/normal/index/base/text";
+ color: 51 153 255 255; }
///
// color_class { name: "/fg/normal/panes/flush";
// color: 51 163 255 255; }
diff --git a/data/elementary/themes/edc/elm/index.edc
b/data/elementary/themes/edc/elm/index.edc
index 903fe2a663..a71260522d 100644
--- a/data/elementary/themes/edc/elm/index.edc
+++ b/data/elementary/themes/edc/elm/index.edc
@@ -3,28 +3,28 @@ group { name: "elm/index/base/vertical/default";
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
rel.to: "elm.swallow.index.0";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
}
part { name: "clip"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
visible: 0;
-color: 255 255 255 0;
+color: 255 255 255 0; // no cc
}
description { state: "active" 0.0;
visible: 1;
-color: 255 255 255 255;
+color: 255 255 255 255; // no cc
}
}
part { name: "clip2"; type: RECT; mouse_events: 0;
clip_to: "clip";
description { state: "default" 0.0;
visible: 0;
-color: 255 255 255 0;
+color: 255 255 255 0; // no cc
}
description { state: "active" 0.0;
visible: 1;
-color: 255 255 255 255;
+color: 255 255 255 255; // no cc
}
}
part { name: "elm.swallow.index.0"; type: SWALLOW;
@@ -60,7 +60,7 @@ group { name: "elm/index/base/vertical/default";
relative: 0.0 0.5;
offset: -48 -1;
}
-color: 51 153 255 255;
+color_class: "/fg/normal/index/base/text";
text { font: FNBD; size: 20;
min: 1 1;
ellipsis: -1;
@@ -97,7 +97,7 @@ group { name: "elm/index/base/vertical/default";
repeat_events: 1;
description { state: "default" 0.0;
rel.to:"elm.swallow.event.0";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
}
}
@@ -131,12 +131,12 @@ group { name: "elm/index/item/vertical/default";
part { name: "base"; type: RECT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
-color: 0 0 0 128;
+color_class: "/dim/normal/index/item";
offscale;
}
description { state: "active" 0.0;
inherit: "default" 0.0;
-rel1.offset: -16 0;
+color_class: "/dim/selected/index/item";
}
}
part { name: "elm.text"; type: TEXT; mouse_event
[EGIT] [core/efl] master 01/01: efl ui focus - unbork focus from noise fix previous commit
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a931374ca5095ae1b93a5ee2e770dde696b532bd commit a931374ca5095ae1b93a5ee2e770dde696b532bd Author: Carsten Haitzler Date: Fri Aug 13 17:31:52 2021 +0100 efl ui focus - unbork focus from noise fix previous commit --- src/lib/elementary/efl_ui_focus_composition.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib/elementary/efl_ui_focus_composition.c b/src/lib/elementary/efl_ui_focus_composition.c index b3cec4f501..de38094c62 100644 --- a/src/lib/elementary/efl_ui_focus_composition.c +++ b/src/lib/elementary/efl_ui_focus_composition.c @@ -161,8 +161,6 @@ _efl_ui_focus_composition_efl_ui_widget_focus_state_apply(Eo *obj, Efl_Ui_Focus_ configured_state->parent == current_state.parent) return !!current_state.manager; - if (!redirect) return EINA_FALSE; - registered = efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect); if (registered) --
[EGIT] [apps/ephoto] master 01/01: cosmetic - dismiss popopup for swettings not del
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=4b71bb9e1b8bea28b8c7c2e7a64eea810bc142b5
commit 4b71bb9e1b8bea28b8c7c2e7a64eea810bc142b5
Author: Carsten Haitzler (Rasterman)
Date: Wed Aug 11 15:41:56 2021 +0100
cosmetic - dismiss popopup for swettings not del
---
src/bin/ephoto_config.c | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c
index 5cd2c55..e6aded8 100644
--- a/src/bin/ephoto_config.c
+++ b/src/bin/ephoto_config.c
@@ -10,6 +10,14 @@ static Eina_Bool _ephoto_gadget_on_config_save(void *data);
static Eet_Data_Descriptor *edd = NULL;
static Eet_Data_Descriptor *gedd = NULL;
+static void
+_config_popup_dismissed_cb(void *data, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ Evas_Object *popup = data;
+ evas_object_del(popup);
+}
+
static void
_config_save_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
@@ -69,7 +77,8 @@ _config_save_cb(void *data, Evas_Object *obj EINA_UNUSED,
eina_stringshare_replace(>config->slideshow_transition,
elm_object_text_get(ephoto->config->slide_trans));
- evas_object_del(popup);
+ evas_object_smart_callback_add(popup, "dismissed",
_config_popup_dismissed_cb, popup);
+ elm_popup_dismiss(popup);
elm_object_focus_set(ephoto->pager, EINA_TRUE);
if (ephoto->state == EPHOTO_STATE_THUMB)
ephoto_thumb_browser_recalc(ephoto);
--
[EGIT] [core/efl] master 01/01: elm focus stuff - just handle corner cases during tree deletes quietly
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=324e74427c5a3f18e1a7108ebc69ce62133a34e9
commit 324e74427c5a3f18e1a7108ebc69ce62133a34e9
Author: Carsten Haitzler
Date: Wed Aug 11 15:35:44 2021 +0100
elm focus stuff - just handle corner cases during tree deletes quietly
like if parent is null in the process of a tree deletion etc
---
src/lib/elementary/efl_ui_focus_composition.c| 2 ++
src/lib/elementary/efl_ui_focus_manager_calc.c | 2 +-
src/lib/elementary/efl_ui_focus_manager_root_focus.c | 1 +
src/lib/elementary/efl_ui_widget.c | 16
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/lib/elementary/efl_ui_focus_composition.c
b/src/lib/elementary/efl_ui_focus_composition.c
index de38094c62..b3cec4f501 100644
--- a/src/lib/elementary/efl_ui_focus_composition.c
+++ b/src/lib/elementary/efl_ui_focus_composition.c
@@ -161,6 +161,8 @@
_efl_ui_focus_composition_efl_ui_widget_focus_state_apply(Eo *obj, Efl_Ui_Focus_
configured_state->parent == current_state.parent)
return !!current_state.manager;
+ if (!redirect) return EINA_FALSE;
+
registered = efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS),
current_state, configured_state, redirect);
if (registered)
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c
b/src/lib/elementary/efl_ui_focus_manager_calc.c
index 5b7589d95f..ec8f1a1adb 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -645,7 +645,7 @@ _efl_ui_focus_manager_calc_update_parent(Eo *obj
EINA_UNUSED, Efl_Ui_Focus_Manag
Node *node;
Node *parent;
- EINA_SAFETY_ON_NULL_RETURN_VAL(parent_obj, EINA_FALSE);
+ if (!parent_obj) return EINA_FALSE;
EINA_SAFETY_ON_NULL_RETURN_VAL(child, EINA_FALSE);
node = node_get(obj, pd, child);
diff --git a/src/lib/elementary/efl_ui_focus_manager_root_focus.c
b/src/lib/elementary/efl_ui_focus_manager_root_focus.c
index 29507001fb..70c0aee2c3 100644
--- a/src/lib/elementary/efl_ui_focus_manager_root_focus.c
+++ b/src/lib/elementary/efl_ui_focus_manager_root_focus.c
@@ -95,6 +95,7 @@
_efl_ui_focus_manager_root_focus_efl_ui_focus_manager_calc_register(Eo *obj, Efl
EOLIAN static Eina_Bool
_efl_ui_focus_manager_root_focus_efl_ui_focus_manager_calc_register_logical(Eo
*obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd, Efl_Ui_Focus_Object *child,
Efl_Ui_Focus_Object *parent, Efl_Ui_Focus_Manager *redirect)
{
+ if (!parent) return EINA_FALSE;
if (efl_ui_focus_manager_calc_register_logical(efl_super(obj, MY_CLASS),
child, parent, redirect))
{
if (redirect && pd->rect_registered)
diff --git a/src/lib/elementary/efl_ui_widget.c
b/src/lib/elementary/efl_ui_widget.c
index 26c4887684..8ad78e28c2 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -441,16 +441,16 @@ _logical_parent_eval(Eo *obj EINA_UNUSED,
Elm_Widget_Smart_Data *pd, Eina_Bool s
if (should)
{
provider = efl_provider_find(obj,
EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE);
- EINA_SAFETY_ON_NULL_RETURN_VAL(provider, NULL);
- parent =
efl_ui_focus_parent_provider_find_logical_parent(provider, obj);
+ if (provider)
+ {
+ EINA_SAFETY_ON_NULL_RETURN_VAL(provider, NULL);
+ parent =
efl_ui_focus_parent_provider_find_logical_parent(provider, obj);
+ }
+ else parent = NULL;
}
-else
- parent = NULL;
- }
- else
- {
-parent = efl_ui_widget_parent_get(obj);
+else parent = NULL;
}
+ else parent = efl_ui_widget_parent_get(obj);
if (pd->logical.parent != parent)
--
[EGIT] [apps/terminology] master 01/01: stop jumping down to the bottm on config changes when no font sz changed
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=7c652b67141dcaf284e7da7715433e090be48a34
commit 7c652b67141dcaf284e7da7715433e090be48a34
Author: Carsten Haitzler
Date: Mon Aug 9 22:20:55 2021 +0100
stop jumping down to the bottm on config changes when no font sz changed
---
src/bin/termio.c | 10 ++
src/bin/termiointernals.c | 3 +--
src/bin/termiointernals.h | 1 +
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/bin/termio.c b/src/bin/termio.c
index 5befd5c..9f41ea2 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -213,8 +213,7 @@ termio_scroll_delta(Evas_Object *obj, int delta, int
by_page)
delta *= by;
}
sd->scroll += delta;
- if (delta <= 0 && sd->scroll < 0)
- sd->scroll = 0;
+ if ((delta <= 0) && (sd->scroll < 0)) sd->scroll = 0;
termio_smart_update_queue(sd);
miniview_position_offset(term_miniview_get(sd->term), -delta, EINA_TRUE);
}
@@ -365,11 +364,15 @@ _font_size_set(Evas_Object *obj, int size)
Termio *sd = evas_object_smart_data_get(obj);
Config *config;
EINA_SAFETY_ON_NULL_RETURN(sd);
+ int font_size_scale;
config = sd->config;
if (size < 5) size = 5;
else if (size > 100) size = 100;
+ font_size_scale = ELM_SCALE_SIZE(size);
+ if (sd->font_size_scale == font_size_scale) return;
+ sd->font_size_scale = font_size_scale;
if (config)
{
config->temporary = EINA_TRUE;
@@ -3561,8 +3564,7 @@ _smart_pty_change(void *data)
EINA_SAFETY_ON_NULL_RETURN(sd);
// if scroll to bottom on updates
- if (sd->jump_on_change)
- sd->scroll = 0;
+ if (sd->jump_on_change) sd->scroll = 0;
termio_smart_update_queue(sd);
}
diff --git a/src/bin/termiointernals.c b/src/bin/termiointernals.c
index 707f85a..1a7cda5 100644
--- a/src/bin/termiointernals.c
+++ b/src/bin/termiointernals.c
@@ -2190,8 +2190,7 @@ termio_internal_mouse_wheel(Termio *sd,
else
{
sd->scroll -= (ev->z * 4);
- if (sd->scroll < 0)
- sd->scroll = 0;
+ if (sd->scroll < 0) sd->scroll = 0;
termio_smart_update_queue(sd);
miniview_position_offset(term_miniview_get(sd->term),
ev->z * 4, EINA_TRUE);
diff --git a/src/bin/termiointernals.h b/src/bin/termiointernals.h
index ae0035a..86e6978 100644
--- a/src/bin/termiointernals.h
+++ b/src/bin/termiointernals.h
@@ -68,6 +68,7 @@ struct _Termio
Evas_Object *ctxpopup;
int zoom_fontsize_start;
int scroll;
+ int font_size_scale;
Evas_Object *self;
Evas_Object *event;
Term *term;
--
[EGIT] [core/efl] master 01/04: edje - we can't rely on string ptr coming from eet file anymore...
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a5c7c65658852f47688becf552ab33b22bfa48f8
commit a5c7c65658852f47688becf552ab33b22bfa48f8
Author: Carsten Haitzler
Date: Mon Aug 9 18:22:06 2021 +0100
edje - we can't rely on string ptr coming from eet file anymore...
---
src/lib/edje/edje_util.c | 19 ---
1 file changed, 19 deletions(-)
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 625898947d..bfbd7c2649 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -5812,7 +5812,6 @@ _edje_real_part_get(const Edje *ed, const char *part)
void *
_edje_hash_find_helper(const Eina_Hash *hash, const char *key)
{
- static const char *remember_key = NULL;
void *data;
int i, j;
char **tokens;
@@ -5822,20 +5821,6 @@ _edje_hash_find_helper(const Eina_Hash *hash, const char
*key)
if (data)
return data;
- // We only receive pointer from Eet files as key, we can
- // assume them constant over the life time of the program.
- if (remember_key == key)
- return NULL;
-
- // It is usually faster to walk the string once to check
- // if there will be any tokens to process, that to allocate
- // an array, copy one token, and then just free it.
- if (strchr(key, '/') == NULL)
- {
-remember_key = key;
-return NULL;
- }
-
tokens = eina_str_split_full(key, "/", 0, _count);
if ((tokens) && (tokens_count > 1))
{
@@ -5860,10 +5845,6 @@ _edje_hash_find_helper(const Eina_Hash *hash, const char
*key)
eina_strbuf_free(buf);
}
- else
- {
-remember_key = key;
- }
if (tokens)
{
--
[EGIT] [core/efl] master 03/04: elm - config - support coarse palette entires with colon
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4596fdd37508e4e7e96893d30a0964d4583df43b
commit 4596fdd37508e4e7e96893d30a0964d4583df43b
Author: Carsten Haitzler
Date: Mon Aug 9 18:47:13 2021 +0100
elm - config - support coarse palette entires with colon
---
src/lib/elementary/elm_config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index ef6581a7ce..63314580d1 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -834,7 +834,7 @@ _palette_apply(const char *name)
l = edje_color_class_list();
EINA_LIST_FREE(l, s)
{
-if ((s) && (s[0] == '/')) edje_color_class_del(s);
+if ((s) && ((s[0] == '/') || s[0] == ':')) edje_color_class_del(s);
free(s);
}
pal = _palette_find(name);
--
[EGIT] [core/efl] master 02/04: edje - fix up colorclass lookups to always be recrusvie now
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=276513f58be6d0e859bd7108301d522ce0d1a6b0
commit 276513f58be6d0e859bd7108301d522ce0d1a6b0
Author: Carsten Haitzler
Date: Mon Aug 9 19:03:38 2021 +0100
edje - fix up colorclass lookups to always be recrusvie now
---
src/lib/edje/edje_calc.c| 2 +-
src/lib/edje/edje_embryo.c | 2 +-
src/lib/edje/edje_lua2.c| 2 +-
src/lib/edje/edje_private.h | 1 -
src/lib/edje/edje_util.c| 55 +++--
5 files changed, 6 insertions(+), 56 deletions(-)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 221e7b645d..7d66345955 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -2560,7 +2560,7 @@ _edje_part_recalc_single_filter(Edje *ed,
if (r && (r[1] == ')') && (r[2] == '\0'))
{
*r = '\0';
-cc = _edje_color_class_find(ed, ccname);
+cc = _edje_color_class_recursive_find(ed, ccname);
if (cc)
{
static const char fmt[] =
diff --git a/src/lib/edje/edje_embryo.c b/src/lib/edje/edje_embryo.c
index bb3828ab3d..0b3c3b0dc7 100644
--- a/src/lib/edje/edje_embryo.c
+++ b/src/lib/edje/edje_embryo.c
@@ -1619,7 +1619,7 @@ _edje_embryo_fn_get_color_class(Embryo_Program *ep,
Embryo_Cell *params)
ed = embryo_program_data_get(ep);
GETSTR(class, params[1]);
if (!class) return 0;
- c_class = _edje_color_class_find(ed, class);
+ c_class = _edje_color_class_recursive_find(ed, class);
if (!c_class) return 0;
SETINT(c_class->r, params[2]);
SETINT(c_class->g, params[3]);
diff --git a/src/lib/edje/edje_lua2.c b/src/lib/edje/edje_lua2.c
index 6032528815..28e6667fda 100644
--- a/src/lib/edje/edje_lua2.c
+++ b/src/lib/edje/edje_lua2.c
@@ -1458,7 +1458,7 @@ _elua_color_class(lua_State *L) // Stack usage [-(10|14),
+(11|15), ?]
edje_color_class_set(class, r, g, b, a, r, g, b, a, r, g, b, a);
}
- c_class = _edje_color_class_find(ed, class);
+ c_class = _edje_color_class_recursive_find(ed, class);
if (!c_class) return 0;
_elua_ret(L, "%r %g %b %a", c_class->r, c_class->g, c_class->b, c_class->a);
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index c0e3f6c247..1d289123a7 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -2538,7 +2538,6 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
Edje_Real_Part *_edje_real_part_get(const Edje *ed, const char *part);
Edje_Real_Part *_edje_real_part_recursive_get(Edje **ed, const char *part);
-Edje_Color_Class *_edje_color_class_find(const Edje *ed, const char
*color_class);
// The color_class has to be a pointer to an Eet owned string.
Edje_Color_Class *_edje_color_class_recursive_find(const Edje *ed, const char
*color_class);
void _edje_color_class_on_del(Edje *ed, Edje_Part *ep);
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index bfbd7c2649..f4d2b4c57f 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -840,7 +840,7 @@ _edje_color_class_active_iterator_next(Eina_Iterator *it,
void **data)
It is being assumed that the color key are the same for all object here.
This can some times not be the case, but for now we should be fine.
*/
- cc = _edje_color_class_find(ed, tuple->key);
+ cc = _edje_color_class_recursive_find(ed, tuple->key);
if (!cc) return EINA_FALSE;
et->cc = *cc;
@@ -972,7 +972,7 @@
_efl_canvas_layout_efl_gfx_color_class_color_class_get(const Eo *obj EINA_UNUSED
if (!color_class)
cc = NULL;
else
- cc = _edje_color_class_find(ed, color_class);
+ cc = _edje_color_class_recursive_find(ed, color_class);
return _edje_color_class_get_internal(cc, layer, r, g, b, a);
}
@@ -986,7 +986,7 @@ edje_object_color_class_description_get(const Evas_Object
*obj, const char *colo
EOLIAN const char *
_efl_canvas_layout_efl_gfx_color_class_color_class_description_get(const Eo
*obj EINA_UNUSED, Edje *ed, const char *color_class)
{
- Edje_Color_Class *cc = _edje_color_class_find(ed, color_class);
+ Edje_Color_Class *cc = _edje_color_class_recursive_find(ed, color_class);
return cc ? cc->desc : NULL;
}
@@ -5854,55 +5854,6 @@ _edje_hash_find_helper(const Eina_Hash *hash, const char
*key)
return data;
}
-Edje_Color_Class *
-_edje_color_class_find(const Edje *ed, const char *color_class)
-{
- Edje_Color_Class *cc = NULL;
-
- if ((!ed) || (!color_class)) return NULL;
-
- /* first look through the object scope */
- cc = eina_hash_find(ed->color_classes, color_class);
- if (cc) return cc;
-
- /* next look through the global scope */
- cc = eina_hash_find(_edje_color_class_hash,
[EGIT] [core/efl] master 04/04: elm theme - use coarse colon based cc's now
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bace9d9ee7ec4fbdff01213ed71ae23205f4e22a
commit bace9d9ee7ec4fbdff01213ed71ae23205f4e22a
Author: Carsten Haitzler
Date: Mon Aug 9 19:04:03 2021 +0100
elm theme - use coarse colon based cc's now
---
data/elementary/themes/colorclasses.edc | 210 +---
data/elementary/themes/edc/gadman.edc | 2 +-
2 files changed, 142 insertions(+), 70 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index c778b72955..c3c30c267d 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -1,7 +1,79 @@
+color_tree {
+ ":bg" {
+ "/bg";
+ }
+ ":fg" {
+ "/fg";
+ "/fg/normal/text-overlay";
+ "/fg/normal/button-media";
+ "/fg/normal/menu/item"; // XXX: dont need this as fallback to /fg will do
+ "/fg/normal/actionslider";
+ "/fg/normal/bubble/info";
+ "/fg/normal/spinner/arrow";
+ "/fg/normal/spinner/text";
+ "/fg/selected/check/check";
+ "/fg/selected/radio/radio";
+ "/fg/normal/notification/text";
+ "/fg/selected/winlist/item/text/iconified";
+ "/fg/pressed/gadgets/tasks/text/iconified";
+ "/fg/normal/gadgets/battery/level/discharge";
+ "/fg/disabled/gadgets/connman/eth/cable";
+ "/fg/normal/gadgets/connman/eth/cable";
+ "/fg/disabled/gadgets/connman/eth/connector";
+ "/fg/normal/gadgets/connman/eth/connector";
+ "/fg/selected/gadgets/connman/eth/connector";
+ "/fg/disabled/gadgets/connman/wifi/connected";
+ "/fg/normal/gadgets/connman/wifi/connected";
+ "/fg/normal/gadgets/connman/wifi/signal";
+ "/fg/normal/gadgets/connman/bt/base";
+ "/fg/normal/gadgets/connman/bt/signal";
+ "/fg/normal/gadgets/connman/cell/base";
+ "/fg/normal/gadgets/connman/cell/signal";
+ "/fg/normal/gadgets/connman/security";
+ "/fg/normal/gadgets/bluez/off";
+ "/fg/normal/gadgets/clock/digital/separator";
+ "/fg/normal/gadgets/clock/analog/hands/hours";
+ }
+ ":selected" {
+ "/bg/selected";
+ "/fg/normal/panes/flush";
+ "/bg/selected/multibuttonentry/button/bar";
+ }
+}
+
color_classes {
///
- color_class { name: "/bg";
+// a core palette that the cc's below map to. this basically makes
+// for example ":selected" like a variable name that is that color and
+// then a list of explicit cc's that map TO that variable color.
+//
+// the idea is that a simple GUI for a palette only shows these variables
+// for you to modify for your colors. the "extended" gui allows you to
+// specifically override specific cc's like "/fg/normal/panes/flush" for
+// example to make a custom color appear for that specific element or anything
+// sharing that specific cc.
+///
+ color_class { name: ":selected";
+ color: 51 153 255 255; }
+ color_class { name: ":bg";
color: 64 64 64 255; }
+ color_class { name: ":fg";
+ color: 160 160 160 255; }
+///
+
+
+///
+// specific element color classes. they fall abck like a directory search to
+// parent dirs so like if something is "/fg/normal" first that is looked for
+// then if that fails "/fg" is looked for etc.
+//
+// this below is inteneded to allow overriding in detail of specific uses
+// and elements, but the abovbe coarser ":something" palette is intended
+// for a simpler smaller set of colors used in a theme to allow very simple
+// setting of these.
+///
+// color_class { name: "/bg";
+// color: 64 64 64 255; }
color_class { name: "/bg-alt";
color: 56 56 56 255; }
color_class { name: "/bg-dark";
@@ -12,11 +84,11 @@ color_classes {
color: 192 192 192 255; }
color_class { name: "/bg-light-alt";
color: 184 184 184 255; }
- color_class { name: "/bg/selected";
- color: 51 153 255 255; }
+// color_class { name: "/bg/selected";
+// color: 51 153 255 255; }
/
[EGIT] [core/efl] master 01/01: pdf loader - also handle non-small letter extns
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0a3a28525c3e9381069fcbe9d20577b35bb2ee72
commit 0a3a28525c3e9381069fcbe9d20577b35bb2ee72
Author: Carsten Haitzler
Date: Mon Aug 9 08:20:23 2021 +0100
pdf loader - also handle non-small letter extns
---
src/generic/evas/pdf/main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/generic/evas/pdf/main.cpp b/src/generic/evas/pdf/main.cpp
index 5c70bfef21..933bae5dd5 100644
--- a/src/generic/evas/pdf/main.cpp
+++ b/src/generic/evas/pdf/main.cpp
@@ -283,7 +283,7 @@ main(int argc, char **argv)
// This is a funny hack to call an external tool to generate a pdf that
will then be processed by poppler
extension = strrchr(file, '.');
dir = dirname(argv[0]);
- if (extension && dir && strcmp(extension, ".pdf"))
+ if (extension && dir && (!(!strcasecmp(extension, ".pdf"
{
#ifndef _WIN32
signal(SIGSEGV, _crash);
--
[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";
[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;
[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: &
[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&qu
[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";
[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=a43d38a426e464e8547498883bf4c761b47fe9d2
commit a43d38a426e464e8547498883bf4c761b47fe9d2
Author: Carsten Haitzler
Date: Sun Aug 8 00:29:05 2021 +0100
elm theme - more cc
---
data/elementary/themes/edc/elm/notify.edc | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/data/elementary/themes/edc/elm/notify.edc
b/data/elementary/themes/edc/elm/notify.edc
index 34d85072bf..15bd731e28 100644
--- a/data/elementary/themes/edc/elm/notify.edc
+++ b/data/elementary/themes/edc/elm/notify.edc
@@ -3,10 +3,11 @@ group { name: "elm/notify/block_events/default";
parts {
part { name: "block_events"; type: RECT;
desc { state: "default";
-color: 0 0 0 0;
+color_class: "/dim/normal/notify";
+color: 255 255 255 0; // no cc
}
desc { "visible";
-color: 0 0 0 128;
+color: 255 255 255 255; // no cc
}
}
program { signal: "mouse,clicked,1"; source: "block_events";
@@ -40,11 +41,11 @@ group { name: "elm/notify/top/default";
description { state: "default" 0.0;
rel1.offset: -500 -500;
rel2.offset: 499 499;
-color: 255 255 255 0;
+color: 255 255 255 0; // no cc
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color: 255 255 255 255; // no cc
}
}
part { name: "shadow"; mouse_events: 0;
@@ -61,7 +62,7 @@ group { name: "elm/notify/top/default";
clip_to: "clip";
scale: 1;
description { state: "default" 0.0;
-color: 48 48 48 255;
+color_class: "/bg/normal/popup/base";
rel1.offset: 10 10;
rel2.offset: -11 -11;
rel1.relative: 0.0 -1.0;
--
[EGIT] [core/efl] master 01/06: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=30558245482e6917f84264296fd5d97dcad114ad
commit 30558245482e6917f84264296fd5d97dcad114ad
Author: Carsten Haitzler
Date: Sat Aug 7 23:50:00 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 11 +++
data/elementary/themes/edc/elm/progress.edc | 107
2 files changed, 56 insertions(+), 62 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index e610e0d5b6..15c0b930f2 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -170,6 +170,17 @@ color_classes {
color: 80 80 80 255; }
color_class { name: "/fg/normal/slider/indicator";
color: 255 255 255 255; }
+///
+ color_class { name: "/bg/normal/progress/base";
+ color: 48 48 48 255; }
+ color_class { name: "/fg/normal/progress/bar";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/progress/bar1";
+ color: 80 80 80 255; }
+ color_class { name: "/fg/normal/progress/pulse";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/progress/text/status";
+ color: 255 255 255 255; }
///
color_class { name: "/bg/normal/entry";
color: 48 48 48 255; }
diff --git a/data/elementary/themes/edc/elm/progress.edc
b/data/elementary/themes/edc/elm/progress.edc
index fdeaac7e34..76b146d3a3 100644
--- a/data/elementary/themes/edc/elm/progress.edc
+++ b/data/elementary/themes/edc/elm/progress.edc
@@ -43,7 +43,7 @@ group { name: "elm/progressbar/horizontal/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 64;
+color: 255 255 255 64; // no cc
}
}
part { name: "pulse_clip"; type: RECT;
@@ -99,7 +99,7 @@ group { name: "elm/progressbar/horizontal/default";
rel2.to_x: "elm.swallow.content";
rel2.relative: 1.0 1.0;
rel2.offset: -1 -5;
-color: 160 160 160 255;
+color_class: "/fg/normal/progress/text";
text { font: FN; size: 10;
text_class: "progressbar";
min: 0 0;
@@ -120,7 +120,7 @@ group { name: "elm/progressbar/horizontal/default";
}
description { state: "disabled_visible" 0.0;
inherit: "visible" 0.0;
-color: 80 80 80 255;
+color_class: "/fg/disabled/progress/text";
}
}
part { name: "bg"; type: RECT;
@@ -130,7 +130,7 @@ group { name: "elm/progressbar/horizontal/default";
max: -1 16;
rel1.offset: 4 4;
rel2.offset: -5 -5;
-color: DARK_GREY_BG_COLOR;
+color_class: "/bg/normal/progress/base";
offscale;
}
description { state: "iclabel" 0.0;
@@ -175,7 +175,7 @@ group { name: "elm/progressbar/horizontal/default";
rel1.to: "bg";
rel2.to_x: "barend";
rel2.to_y: "bg";
-color: 51 153 255 255;
+color_class: "/fg/normal/progress/bar";
offscale;
}
description { state: "inv" 0.0;
@@ -193,7 +193,7 @@ group { name: "elm/progressbar/horizontal/default";
max: 16 ;
rel.to: "elm.swallow.bar";
align: 0.0 0.5;
-color: 51 153 255 255;
+color_class: "/fg/normal/progress/pulse";
}
description { state: "end" 0.0;
inherit: "default" 0.0;
@@ -213,7 +213,7 @@ group { name: "elm/progressbar/horizontal/default";
text_class: "progress_status";
align: 1.0 0.5;
}
-color: 255 255 255 255;
+color_class: "/fg/normal/progress/text/status";
offscale;
}
description { state: "hidden" 0.0;
@@ -387,12 +387,11 @@ group { name: "elm/progressbar/vertical/default";
parts {
part { name: "dis_clip"; type: RECT;
description { state: "default" 0.0;
-rel1.to: "elm.swallow.content";
-rel2.to: "elm.swallow.content";
+rel.to: "elm.swallow.content";
}
description { state: "disabled" 0.0;
inherit: "de
[EGIT] [core/efl] master 02/06: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e2a767f7ca799a1e648cb54c1adea197b7ab7fd4
commit e2a767f7ca799a1e648cb54c1adea197b7ab7fd4
Author: Carsten Haitzler
Date: Sat Aug 7 23:51:19 2021 +0100
elm theme - more cc
---
data/elementary/themes/edc/elm/progress.edc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/elementary/themes/edc/elm/progress.edc
b/data/elementary/themes/edc/elm/progress.edc
index 76b146d3a3..c086fde506 100644
--- a/data/elementary/themes/edc/elm/progress.edc
+++ b/data/elementary/themes/edc/elm/progress.edc
@@ -858,7 +858,7 @@ group { name: "elm/progressbar/horizontal/hidden_bare";
parts {
part { name: "bg";
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
}
}
@@ -1053,7 +1053,7 @@ group { name: "elm/progressbar/horizontal/hidden_wheel";
part { name: "base"; type: RECT;
scale: 1;
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
rel1.offset: 4 4;
rel2.offset: -5 -5;
min: 40 40;
@@ -1078,7 +1078,7 @@ group { name: "elm/progressbar/horizontal/wheel";
}
description { state: "hidden" 0.0;
inherit;
-color: 48 48 48 0;
+color: 255 255 255 0; // no cc
visible: 0;
}
}
@@ -1222,7 +1222,7 @@ group { name: "elm/progressbar/horizontal/bar";
part { name: "base"; type: RECT;
scale: 1;
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
rel1.offset: 4 4;
rel2.offset: -5 -5;
min: 100 20;
--
[EGIT] [core/efl] master 04/06: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=435bd5175ee52f2a50f8823a0193dbbe021f48e9
commit 435bd5175ee52f2a50f8823a0193dbbe021f48e9
Author: Carsten Haitzler
Date: Sun Aug 8 00:16:14 2021 +0100
elm theme - more cc
---
data/elementary/themes/edc/elm/player.edc | 18 +-
data/elementary/themes/edc/elm/popup.edc | 1 +
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/data/elementary/themes/edc/elm/player.edc
b/data/elementary/themes/edc/elm/player.edc
index 1cf05d7261..c92c4f2a59 100644
--- a/data/elementary/themes/edc/elm/player.edc
+++ b/data/elementary/themes/edc/elm/player.edc
@@ -4,12 +4,12 @@ group { name: "elm/player/base/default";
public in_control;
public in_volume;
public inside;
-
+
public eval_in() {
new v1 = get_int(in_control);
new v2 = get_int(in_volume);
new isin = get_int(inside);
-
+
if (isin) {
if ((!v1) && (!v2)) {
emit("conhide", "");
@@ -26,7 +26,7 @@ group { name: "elm/player/base/default";
parts {
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
-color: 0 0 0 255;
+color: 0 0 0 255; // no cc
}
}
part { name: "clipper"; type: RECT;
@@ -49,7 +49,7 @@ group { name: "elm/player/base/default";
rel1.to_y: "elm.swallow.media_player.prev";
rel2.to_y: "elm.swallow.media_player.positionslider";
rel2.offset: -1 4;
-color: 64 64 64 255;
+color_class: "/bg/normal/player/bar";
offscale;
}
}
@@ -57,12 +57,12 @@ group { name: "elm/player/base/default";
part { name: "volclip"; type: RECT;
description { state: "default" 0.0;
rel1.to: "bg";
-color: 255 255 255 0;
+color: 255 255 255 0; // no cc
visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color: 255 255 255 255; // no cc
visible: 1;
}
}
@@ -73,7 +73,7 @@ group { name: "elm/player/base/default";
rel1.offset: -1 -1;
rel2.to: "elm.swallow.media_player.volumeslider";
rel2.offset: 0 0;
-color: 64 64 64 255;
+color_class: "/bg/normal/player/bar";
}
}
@@ -296,7 +296,7 @@ group { name: "elm/player/base/default";
min: BSZ BSZ;
align: 0.5 1.0;
rel1.relative: 0.0 0.8;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
}
@@ -321,7 +321,7 @@ group { name: "elm/player/base/default";
rel2.to: "elm.swallow.media_player.volume";
rel2.relative: 2.0 1.0;
align: 0.5 1.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
visible: 0;
}
description { state: "visible" 0.0;
diff --git a/data/elementary/themes/edc/elm/popup.edc
b/data/elementary/themes/edc/elm/popup.edc
index b9566a3121..aef9134e6a 100644
--- a/data/elementary/themes/edc/elm/popup.edc
+++ b/data/elementary/themes/edc/elm/popup.edc
@@ -44,6 +44,7 @@ group { name: "elm/notify/top/popup/default";
description { state: "default" 0.0; \
rel.to: "base"; \
WIN_SHADOW; \
+color_class: "/shadow/normal/popup"; \
} \
} \
part { name: "base"; type: RECT; \
--
[EGIT] [core/efl] master 03/06: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=648bbf8b37b6823696c7b4bfdaffa6e7b250de5e
commit 648bbf8b37b6823696c7b4bfdaffa6e7b250de5e
Author: Carsten Haitzler
Date: Sun Aug 8 00:13:22 2021 +0100
elm theme - more cc
---
data/elementary/themes/edc/elm/popup.edc | 26 ++
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/data/elementary/themes/edc/elm/popup.edc
b/data/elementary/themes/edc/elm/popup.edc
index 7db6913757..b9566a3121 100644
--- a/data/elementary/themes/edc/elm/popup.edc
+++ b/data/elementary/themes/edc/elm/popup.edc
@@ -2,7 +2,7 @@ group { name: "elm/notify/block_events/popup/default";
inherit: "elm/notify/block_events/default";
parts.part { "block_events";
desc { "visible";
- color: 0 0 0 128;
+ color_class: "/dim/normal/popup";
}
}
}
@@ -11,10 +11,12 @@ group { name: "elm/notify/block_events/popup/transparent";
parts {
part { name: "base"; type: RECT;
description { state: "default" 0.0;
-color: 0 0 0 0;
+color_class: "/dim/normal/popup";
+color: 255 255 255 0; // no cc
}
description { state: "clicked" 0.0;
-color: 0 0 0 192;
+color_class: "/dim/normal/popup";
+color: 255 255 255 255; // no cc
}
}
program { signal: "mouse,down,1"; source: "base";
@@ -46,10 +48,10 @@ group { name: "elm/notify/top/popup/default";
} \
part { name: "base"; type: RECT; \
description { state: "default" 0.0; \
-color: 48 48 48 255; \
+color_class: "/bg/normal/popup/base"; \
} \
description { state: "visible" 0.0; \
-color: 48 48 48 255; \
+color_class: "/bg/normal/popup/base"; \
} \
} \
}
@@ -137,7 +139,7 @@ group { name: "elm/label/base/popup/default";
alias: "elm/label/base/popup/transparent";
styles {
style { name: "popup_desc_style";
- base: "font="FN" font_size=10 text_class=label align=center
color=#a0a0a0 wrap=mixed";
+ base: "font="FN" font_size=10 text_class=label align=center
color=cc:/fg/normal/popup/text wrap=mixed";
tag: "br" "\n";
tag: "hilight" "+ font="FNBD" text_class=label_light";
tag: "b" "+ font="FNBD" text_class=label_light";
@@ -145,7 +147,7 @@ group { name: "elm/label/base/popup/default";
tag: "tab" "\t";
}
style { name: "popup_title_style_ellipsis";
- base: "font="FNBD" font_size=10 text_class=label align=center
color=#fff ellipsis=1.0 wrap=mixed";
+ base: "font="FNBD" font_size=10 text_class=label align=center
color=cc:/fg/normal/popup/text/title ellipsis=1.0 wrap=mixed";
tag: "br" "\n";
tag: "hilight" "+ font="FNBD" text_class=label_light";
tag: "b" "+ font="FNBD" text_class=label_light";
@@ -181,7 +183,7 @@ group { name: "elm/popup/base/default";
alias: "elm/popup/base/transparent";
styles {
style { name: "popup_title_style";
- base: "font="FNBD" font_size=10 text_class=label align=center
color=#fff wrap=mixed";
+ base: "font="FNBD" font_size=10 text_class=label align=center
color=cc:/fg/normal/popup/text/title wrap=mixed";
tag: "br" "\n";
tag: "hilight" "+ font="FNBD" text_class=label_light";
tag: "b" "+ font="FNBD" text_class=label_light";
@@ -194,7 +196,7 @@ group { name: "elm/popup/base/default";
scale: 1;
description { state: "default" 0.0;
min: 240 0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
}
part { name: "elm.swallow.background"; type: SWALLOW;
@@ -208,7 +210,7 @@ group { name: "elm/popup/base/default";
description { state: "default" 0.0;
fixed: 1 1;
rel.to: "elm.text.title";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
}
part { name: "elm.text.title"; type: TEXTBLOCK;
@@ -294,14 +296,14 @@ group { name: "elm/popup/base/default";
description { state: "default" 0.0;
fixed: 1 1;
rel.to: "elm.bg.title";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
}
part { name: "access.body"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
fixed: 1 1;
rel.to: "elm.swallow.content";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
}
}
--
[EGIT] [core/efl] master 05/06: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2b41ee338a65be695c10dcad7baf8fa569719d2f
commit 2b41ee338a65be695c10dcad7baf8fa569719d2f
Author: Carsten Haitzler
Date: Sun Aug 8 00:17:21 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 5 +
1 file changed, 5 insertions(+)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 15c0b930f2..55dc7a38ba 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -49,6 +49,11 @@ color_classes {
color: 0 0 0 200; }
color_class { name: "/dim/disabled";
color: 0 0 0 80; }
+///
+ color_class { name: "/bg/normal/popup";
+ color: 48 48 48 255; }
+ color_class { name: "/fg/normal/popup/text/title";
+ color: 255 255 255 255; }
///
color_class { name: "/fg/normal/menu/title";
color: 255 255 255 255; }
--
[EGIT] [core/efl] master 06/06: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=12ef80292e8143483d22b5e3f213f9f6210751dc
commit 12ef80292e8143483d22b5e3f213f9f6210751dc
Author: Carsten Haitzler
Date: Sun Aug 8 00:23:31 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 5 +
data/elementary/themes/edc/elm/photo.edc | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 55dc7a38ba..8f5ea4ceec 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -54,6 +54,11 @@ color_classes {
color: 48 48 48 255; }
color_class { name: "/fg/normal/popup/text/title";
color: 255 255 255 255; }
+///
+ color_class { name: "/bg/normal/photo/outline";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/photo/base";
+ color: 48 48 48 255; }
///
color_class { name: "/fg/normal/menu/title";
color: 255 255 255 255; }
diff --git a/data/elementary/themes/edc/elm/photo.edc
b/data/elementary/themes/edc/elm/photo.edc
index dd8cce3098..46da4d5d8c 100644
--- a/data/elementary/themes/edc/elm/photo.edc
+++ b/data/elementary/themes/edc/elm/photo.edc
@@ -1,12 +1,11 @@
group { name: "elm/photo/base/default";
- images.image: "win_shadow.png" COMP;
parts {
part { name: "base"; type: RECT;
scale: 1;
description { state: "default" 0.0;
rel1.offset: 4 4;
rel2.offset: -5 -5;
-color: 255 255 255 255;
+color_class: "/bg/normal/photo/outline";
offscale;
}
}
@@ -22,7 +21,7 @@ group { name: "elm/photo/base/default";
part { name: "bg"; type: RECT;
description { state:"default" 0.0;
rel.to: "clip";
-color: 48 48 48 255;
+color_class: "/bg/normal/photo/base";
}
}
part { name: "elm.swallow.content"; type: SWALLOW;
@@ -69,6 +68,7 @@ group { name: "elm/photo/base/shadow";
rel.to: "size";
rel1.offset: 0 0;
rel2.offset: -1 -1;
+visible: 0;
}
}
part { name: "clip";
--
[EGIT] [core/enlightenment] master 01/01: check glapi better and report errors sensibly if it fails init
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=0bd602b7edba1ce4e1a76e93d8cdb584ac9111d1
commit 0bd602b7edba1ce4e1a76e93d8cdb584ac9111d1
Author: Carsten Haitzler
Date: Thu Aug 5 14:14:31 2021 +0100
check glapi better and report errors sensibly if it fails init
---
src/bin/e_comp_wl.c | 19 ++-
src/bin/e_pixmap.c | 3 ++-
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index c21dcc971..0df8544fa 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2959,6 +2959,7 @@ e_comp_wl_query_dmabuf_formats(int max_formats, int
*formats, int *num_formats)
{
*num_formats = 0;
#if EVAS_GL_API_VERSION >= 7
+ if (!e_comp_wl->wl.glapi) return EINA_FALSE;
if (!e_comp_wl->wl.glapi->evasglQueryDmaBufFormats) return EINA_FALSE;
return e_comp_wl->wl.glapi->evasglQueryDmaBufFormats(e_comp_wl->wl.gl,
max_formats, formats, num_formats);
#else
@@ -2971,6 +2972,7 @@ e_comp_wl_query_dmabuf_modifiers(int format, int
max_modifiers, uint64_t *modifi
{
*num_modifiers = 0;
#if EVAS_GL_API_VERSION >= 7
+ if (!e_comp_wl->wl.glapi) return EINA_FALSE;
if (!e_comp_wl->wl.glapi->evasglQueryDmaBufModifiers) return EINA_FALSE;
return e_comp_wl->wl.glapi->evasglQueryDmaBufModifiers(e_comp_wl->wl.gl,
format, max_modifiers, modifiers, external_only, num_modifiers);
#else
@@ -2991,12 +2993,19 @@ _e_comp_wl_gl_init(void)
if (!e_comp_wl->wl.glsfc) goto end;
if (!evas_gl_make_current(e_comp_wl->wl.gl, e_comp_wl->wl.glsfc,
e_comp_wl->wl.glctx)) goto end;
e_comp_wl->wl.glapi = evas_gl_context_api_get(e_comp_wl->wl.gl,
e_comp_wl->wl.glctx);
- if (e_comp_wl->wl.glapi->evasglBindWaylandDisplay)
- e_comp->gl =
e_comp_wl->wl.glapi->evasglBindWaylandDisplay(e_comp_wl->wl.gl,
e_comp_wl->wl.disp);
- if (e_comp->gl)
+ if (e_comp_wl->wl.glapi)
{
-e_util_env_set("ELM_ACCEL", "gl");
-return;
+if (e_comp_wl->wl.glapi->evasglBindWaylandDisplay)
+ e_comp->gl =
e_comp_wl->wl.glapi->evasglBindWaylandDisplay(e_comp_wl->wl.gl,
e_comp_wl->wl.disp);
+if (e_comp->gl)
+ {
+ e_util_env_set("ELM_ACCEL", "gl");
+ return;
+ }
+ }
+ else
+ {
+ERR("Cannot get glapi. Is osmesa installed?");
}
end:
_e_comp_wl_gl_shutdown();
diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index 505536442..2edace94f 100644
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -591,12 +591,13 @@ e_pixmap_refresh(E_Pixmap *cp)
format = wl_shm_buffer_get_format(buffer->shm_buffer);
else if (buffer->dmabuf_buffer)
format = buffer->dmabuf_buffer->attributes.format;
- else
+ else if (e_comp_wl->wl.glapi)
{
e_comp_wl->wl.glapi->evasglQueryWaylandBuffer
(e_comp_wl->wl.gl, buffer->resource, EGL_TEXTURE_FORMAT,
);
}
+ else return EINA_FALSE;
switch (format)
{
--
[EGIT] [core/efl] master 01/03: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d109e1a057ade46074a69f4d70bded56c7f5b6e3
commit d109e1a057ade46074a69f4d70bded56c7f5b6e3
Author: Carsten Haitzler
Date: Fri Jul 30 11:51:11 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc| 7 +
data/elementary/themes/edc/elm/genlist.edc | 6 +-
data/elementary/themes/edc/elm/pointer.edc | 4 +-
data/elementary/themes/edc/elm/slider.edc | 572 +++--
data/elementary/themes/edc/elm/thumb.edc | 9 +-
data/elementary/themes/edc/elm/toolbar.edc | 296 ---
data/elementary/themes/edc/slider.edc | 6 +-
7 files changed, 401 insertions(+), 499 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index bf8cade741..2bb1eff68a 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -161,6 +161,8 @@ color_classes {
color: 51 153 255 255; }
color_class { name: "/fg/disabled/slider/bar";
color: 80 80 80 255; }
+ color_class { name: "/fg/normal/slider/indicator";
+ color: 255 255 255 255; }
///
color_class { name: "/bg/normal/entry";
color: 48 48 48 255; }
@@ -243,6 +245,9 @@ color_classes {
color: 160 160 160 255; }
color_class { name: "/fg/selected/menu/item";
color: 255 255 255 255; }
+///
+ color_class { name: "/fg/selected/thumb/bar";
+ color: 51 153 255 255; }
///
color_class { name: "/bg/normal/list/group";
color: 32 32 32 255; }
@@ -439,6 +444,8 @@ color_classes {
///
color_class { name: "/bg/selected/toolbar/base";
color: 32 32 32 255; }
+ color_class { name: "/fg/selected/toolbar/separator";
+ color: 80 80 80 255; }
///
color_class { name: "/fg/normal/winlist/text/title";
color: 255 255 255 255; }
diff --git a/data/elementary/themes/edc/elm/genlist.edc
b/data/elementary/themes/edc/elm/genlist.edc
index 280695c7d5..290cf0b651 100644
--- a/data/elementary/themes/edc/elm/genlist.edc
+++ b/data/elementary/themes/edc/elm/genlist.edc
@@ -406,7 +406,7 @@ group { "elm/genlist/item/default_style/default"; nomouse;
data.item: "treesize" TREEPAD;
data.item: "flips" "elm.text.flip";
styles.style { "genlist_style";
- base: "font="FN" font_size=10 align=left valign=0.5 color=#a0a0a0
text_class=list_item";
+ base: "font="FN" font_size=10 align=left valign=0.5
color=cc:/fg/normal/list/item text_class=list_item";
tag: "br" "\n";
tag: "ps" "ps";
tag: "hilight" "+ font_weight=Bold";
@@ -414,7 +414,7 @@ group { "elm/genlist/item/default_style/default"; nomouse;
tag: "tab" "\t";
}
styles.style { "genlist_style_selected";
- base: "font="FN" font_size=10 align=left valign=0.5 color=#ff
text_class=list_item_selected";
+ base: "font="FN" font_size=10 align=left valign=0.5
color=cc:/fg/selected/list/item text_class=list_item_selected";
tag: "br" "\n";
tag: "ps" "ps";
tag: "hilight" "+ font_weight=Bold";
@@ -422,7 +422,7 @@ group { "elm/genlist/item/default_style/default"; nomouse;
tag: "tab" "\t";
}
styles.style { "genlist_style_disabled";
- base: "font="FN" font_size=10 align=left valign=0.5 color=#505050
text_class=list_item";
+ base: "font="FN" font_size=10 align=left valign=0.5
color=cc:/fg/disabled/list/item text_class=list_item";
tag: "br" "\n";
tag: "ps" "ps";
tag: "hilight" "+ font_weight=Bold";
diff --git a/data/elementary/themes/edc/elm/pointer.edc
b/data/elementary/themes/edc/elm/pointer.edc
index afa13b36b6..9c91737108 100644
--- a/data/elementary/themes/edc/elm/pointer.edc
+++ b/data/elementary/themes/edc/elm/pointer.edc
@@ -49,7 +49,7 @@ group { name: "elm/pointer/base/bottom_right_corner";
part { name: "box"; type: RECT;
insert_after: "base";
description { state: "default" 0.0;
-color: 51 153 255 192;
+
[EGIT] [core/efl] master 03/03: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=671fb7ee5fcdca8a62f863234c17db42acea6bf9
commit 671fb7ee5fcdca8a62f863234c17db42acea6bf9
Author: Carsten Haitzler
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;
+
[EGIT] [core/efl] master 02/03: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e5e9be1e8531b0bc87fc7112caab030d6072c004
commit e5e9be1e8531b0bc87fc7112caab030d6072c004
Author: Carsten Haitzler
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
[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=2efabb074ba5cfb26e15aae335427f299d385688
commit 2efabb074ba5cfb26e15aae335427f299d385688
Author: Carsten Haitzler
Date: Thu Jul 29 21:58:49 2021 +0100
elm theme - more cc
---
data/elementary/themes/edc/elm/entry.edc| 8
data/elementary/themes/edc/elm/genlist.edc | 8
data/elementary/themes/edc/elm/list.edc | 4 ++--
data/elementary/themes/edc/elm/photocam.edc | 6 +++---
data/elementary/themes/edc/elm/pointer.edc | 19 ++-
5 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/data/elementary/themes/edc/elm/entry.edc
b/data/elementary/themes/edc/elm/entry.edc
index 47ca85c03b..38840e3cb2 100644
--- a/data/elementary/themes/edc/elm/entry.edc
+++ b/data/elementary/themes/edc/elm/entry.edc
@@ -330,7 +330,7 @@ group { name: "elm/scroller/entry_single/default";
scale: 1;
clip_to: "sh_clip";
description { state: "default" 0.0;
-color: 255 255 255 255; // no cc
+color: 255 255 255 0; // no cc
color_class: "/shadow/normal/entry";
rel.to: "bg";
rel1.offset: -1 0;
@@ -342,7 +342,7 @@ group { name: "elm/scroller/entry_single/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;
@@ -1044,7 +1044,7 @@ group { name: "elm/entry/handler/start/default";
scale: 1;
description { state: "default" 0.0;
rel.to: "base";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
min: 32 32;
visible: 0;
}
@@ -1089,7 +1089,7 @@ group { name: "elm/entry/handler/end/default";
scale: 1;
description { state: "default" 0.0;
rel.to: "base";
-color: 0 0 0 0;
+color: 0 0 0 0; //no cc
min: 32 32;
visible: 0;
}
diff --git a/data/elementary/themes/edc/elm/genlist.edc
b/data/elementary/themes/edc/elm/genlist.edc
index 0763ab50f0..280695c7d5 100644
--- a/data/elementary/themes/edc/elm/genlist.edc
+++ b/data/elementary/themes/edc/elm/genlist.edc
@@ -1451,7 +1451,7 @@ group { "elm/genlist/tree/tree_effect/default"; nomouse;
}
desc { "map_transition";
inherit: "default";
-color: 0 0 0 255; // fixed color
+color: 0 0 0 255; // no cc - fixed color
map.rotation.x: -90;
link { base: "elm,action,flip_item";
after: "rot2";
@@ -2448,7 +2448,7 @@ group { "elm/genlist/item/media/default"; nomouse;
} \
rect { "base"; \
desc { "default"; \
- color: 56 56 56 255; \
+ color_class: "/bg-alt/normal/list/item"; \
} \
} \
} \
@@ -2999,7 +2999,7 @@ group {
"elm/genlist/item_odd_compress/media-preview/default";
} \
rect { "base"; \
desc { "default"; \
- color: 56 56 56 255; \
+ color_class: "/bg-alt/normal/list/item"; \
} \
} \
} \
@@ -3110,7 +3110,7 @@ group { "elm/genlist/item/mode/default"; nomouse;
desc { "default";
rel1.to: "base";
rel2.to: "base";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
desc { "repeat_events";
inherit: "default";
diff --git a/data/elementary/themes/edc/elm/list.edc
b/data/elementary/themes/edc/elm/list.edc
index 170ed0a831..6a77983248 100644
--- a/data/elementary/themes/edc/elm/list.edc
+++ b/data/elementary/themes/edc/elm/list.edc
@@ -61,7 +61,7 @@ group { name: "elm/list/item/default";
parts {
part { name: "event"; type: RECT;
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
@@ -223,7 +223,7 @@ group { name: "elm/list/h_item/default";
parts {
part { name: "event"; type: RECT;
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
diff --git a/data/elementary/themes/e
[EGIT] [core/efl] master 01/02: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=001a153791674fc4e48eb3c2dbca820aac81d0f6
commit 001a153791674fc4e48eb3c2dbca820aac81d0f6
Author: Carsten Haitzler
Date: Sun Jul 25 22:19:10 2021 +0100
elm theme - more cc
---
data/elementary/themes/edc/desklock.edc| 2 +-
data/elementary/themes/edc/elm/border.edc | 4 ++--
data/elementary/themes/edc/elm/button.edc | 14 +++---
data/elementary/themes/edc/elm/check.edc | 8
data/elementary/themes/edc/elm/spinner.edc | 10 +-
data/elementary/themes/edc/elm/tooltip.edc | 16
data/elementary/themes/edc/elm/uiclock.edc | 20 +---
data/elementary/themes/edc/elm/video.edc | 4 ++--
8 files changed, 38 insertions(+), 40 deletions(-)
diff --git a/data/elementary/themes/edc/desklock.edc
b/data/elementary/themes/edc/desklock.edc
index b0e40b9449..e0b2272de9 100644
--- a/data/elementary/themes/edc/desklock.edc
+++ b/data/elementary/themes/edc/desklock.edc
@@ -340,7 +340,7 @@ group { name: "e/desklock/pin_box";
rel2.offset: -4 -3;
color_class: "/fg/normal/desklock/text/title/pin";
align: 0.5 0.0;
-text { font: "Sans:style=Bold"; size: 10;
+text { font: FNBD; size: 10;
min: 0 1;
align: 0.5 0.5;
text_class: "desklock_title";
diff --git a/data/elementary/themes/edc/elm/border.edc
b/data/elementary/themes/edc/elm/border.edc
index ebf8c47265..eccd61ddba 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -622,12 +622,12 @@ group { name: "elm/border/base/default";
rect { "indicator_bg";
clip: "bg_clip";
desc { "default";
-color: 148 23 45 255; // never see this...
+color: 148 23 45 255; // no cc never see this...
rel.to: "elm.swallow.indicator";
}
desc { "bg_transparent";
inherit: "default";
-color: 0 0 0 0; // never see this...
+color: 0 0 0 0; // no cc never see this...
}
}
swallow { "elm.swallow.indicator";
diff --git a/data/elementary/themes/edc/elm/button.edc
b/data/elementary/themes/edc/elm/button.edc
index 0e95d1cecc..6e7dc9f37b 100644
--- a/data/elementary/themes/edc/elm/button.edc
+++ b/data/elementary/themes/edc/elm/button.edc
@@ -455,7 +455,7 @@ group { name: "elm/button/base/anchor";
}
rect { "event";
desc { "default";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
desc { "disabled";
inherit: "default";
@@ -580,15 +580,15 @@ group { name: "elm/button/base/blank";
}
part { name: "base";
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
visible: 0;
}
description { state: "pressed" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
visible: 1;
}
description { state: "disabled" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
visible: 0;
}
}
@@ -1358,7 +1358,7 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
}
part { name: "disabler"; type: RECT;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
visible: 0;
}
description { state: "disabled" 0.0;
@@ -1469,7 +1469,7 @@ group { name: "elm/button/base/combobox_vertical/default";
}
rect { name: "event";
desc { "default";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
desc { "disabled";
inherit: "default";
@@ -1538,7 +1538,7 @@ group { name: "elm/button/base/combobox_vertical/default";
}
rect { name: "event2";
desc { "default";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
rel.to: "base";
rel2.to_x: "select_line";
rel2.relative: 0.0 1.0;
diff --git a/data/elementary/themes/edc/elm/check.edc
b/data/elementary/themes/edc/elm/check.edc
index 60422da36f..461f84a3b5 100644
--- a/data/elementary/themes/edc/elm/check.edc
+++ b/data/elementary/themes/edc/elm/check.edc
@@ -465,7 +465,7 @@ group { name: "elm/check/base/toggle";
rel.to: "tog";
min: 15 15;
max: 15 9
[EGIT] [core/efl] master 02/02: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cd6e9f3e567caf0f4b6cc00d7a38181da3c995ba
commit cd6e9f3e567caf0f4b6cc00d7a38181da3c995ba
Author: Carsten Haitzler
Date: Thu Jul 29 00:02:50 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 11
data/elementary/themes/edc/elm/radio.edc | 76 +++---
data/elementary/themes/edc/elm/slideshow.edc | 94 +++-
data/elementary/themes/edc/elm/tooltip.edc | 14 ++---
4 files changed, 97 insertions(+), 98 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 504bae75ba..bf8cade741 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -204,16 +204,22 @@ color_classes {
///
color_class { name: "/bg/normal/button";
color: 96 96 96 255; }
+ color_class { name: "/bg/selected/button";
+ color: 128 128 128 255; }
color_class { name: "/bg/pressed/button";
color: 80 80 80 255; }
color_class { name: "/bg/disabled/button";
color: 64 64 64 255; }
color_class { name: "/fg/normal/button";
color: 192 192 192 255; }
+ color_class { name: "/fg/selected/button";
+ color: 255 255 255 255; }
color_class { name: "/fg/pressed/button";
color: 255 255 255 255; }
color_class { name: "/fg/disabled/button";
color: 97 96 96 255; }
+ color_class { name: "/fg/selected/button/bar";
+ color: 51 153 255 255; }
color_class { name: "/fg/normal/button-anchor";
color: 51 153 255 255; }
color_class { name: "/fg/pressed/button-anchor";
@@ -445,6 +451,11 @@ color_classes {
///
color_class { name: "/fg/normal/wizard/text/title";
color: 255 255 255 255; }
+///
+ color_class { name: "/fg/normal/tooltip/text";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/toolip/text/hilight";
+ color: 51 153 255 255; }
///
color_class { name: "/fg/normal/gadgets/temperature/low";
color: 51 153 255 255; }
diff --git a/data/elementary/themes/edc/elm/radio.edc
b/data/elementary/themes/edc/elm/radio.edc
index 5920d162d1..482125e779 100644
--- a/data/elementary/themes/edc/elm/radio.edc
+++ b/data/elementary/themes/edc/elm/radio.edc
@@ -30,13 +30,13 @@ group { name: "elm/radio/base/default";
}
rect { "icon_clip";
desc { "default";
-color: 255 255 255 255;
+color: 255 255 255 255; // no cc
}
desc { "pressed"; inherit;
-color: 255 255 255 255;
+color: 255 255 255 255; // no cc
}
desc { "disabled"; inherit;
-color: 255 255 255 64;
+color: 255 255 255 64; // no cc
}
}
swallow { "elm.swallow.content"; nomouse;
@@ -97,26 +97,26 @@ group { name: "elm/radio/base/default";
image.normal: "i-radio";
min: 15 15;
max: 15 15;
-color: 0 0 0 64;
+color_class: "/bg/normal/radio/base";
fixed: 1 1;
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color_class: "/fg/pressed/radio/base";
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
-color: 160 160 160 255;
+color_class: "/fg/selected/radio/base";
}
desc { "disabled"; inherit;
-color: 0 0 0 16;
+color_class: "/bg/disabled/radio/base";
}
}
text { "elm.text"; nomouse;
scale: 1;
desc { "default";
fixed: 0 1;
-color: 160 160 160 255;
+color_class: "/fg/normal/radio/text";
rel1.offset: 0 4;
rel1.relative: 1.0 0.0;
rel1.to_x: "elm.swallow.content";
@@ -138,7 +138,7 @@ group { name: "elm/radio/base/default";
}
desc { "pressed_visible"; inherit;
fixed: 0 0;
-color: 255 255 255 255;
+color_class: "/fg/prssed/radio/text";
rel1.offset: 4 4;
text.min: 1 1;
text
[EGIT] [core/enlightenment] master 01/01: remove unsed vars
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=1c225c082d981ee6c40d6c5aec0d14d8c8dc7d49
commit 1c225c082d981ee6c40d6c5aec0d14d8c8dc7d49
Author: Carsten Haitzler
Date: Mon Jul 26 21:34:27 2021 +0100
remove unsed vars
---
src/modules/pager/e_mod_main.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 7e3b6c633..dd630b1f4 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -656,7 +656,6 @@ static void
_pager_desk_switch(Pager_Desk *pd1, Pager_Desk *pd2)
{
int c;
- E_Zone *zone1, *zone2;
E_Desk *desk1, *desk2;
Pager_Win *pw;
Eina_List *l;
@@ -666,8 +665,6 @@ _pager_desk_switch(Pager_Desk *pd1, Pager_Desk *pd2)
desk1 = pd1->desk;
desk2 = pd2->desk;
- zone1 = pd1->desk->zone;
- zone2 = pd2->desk->zone;
/* Move opened windows from on desk to the other */
EINA_LIST_FOREACH(pd1->wins, l, pw)
--
[EGIT] [core/enlightenment] master 01/01: pager - remove desk show coede on swap as it just locks up desk switchn
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=28258cf1054df8549505423330d1e7a6144f93f8
commit 28258cf1054df8549505423330d1e7a6144f93f8
Author: Carsten Haitzler
Date: Mon Jul 26 20:29:50 2021 +0100
pager - remove desk show coede on swap as it just locks up desk switchn
middle mouse drag on pager to swap whole desks is a bit borken with
this code - remove it.
@fix
---
src/modules/pager/e_mod_main.c | 12
1 file changed, 12 deletions(-)
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index b7b317cf6..7e3b6c633 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -741,18 +741,6 @@ _pager_desk_switch(Pager_Desk *pd1, Pager_Desk *pd2)
}
}
if (c > 0) e_config_save();
-
- /* If the current desktop has been switched, force to update of the screen
*/
- if (desk2 == e_desk_current_get(zone2))
- {
-desk2->visible = 0;
-e_desk_show(desk2);
- }
- if (desk1 == e_desk_current_get(zone1))
- {
-desk1->visible = 0;
-e_desk_show(desk1);
- }
}
static Pager_Win *
--
[EGIT] [core/enlightenment] master 01/01: randr - allow custom names for screen (not output but model)
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=a4626f87fdc510f20ff16c017d81a8202b416f61
commit a4626f87fdc510f20ff16c017d81a8202b416f61
Author: Carsten Haitzler
Date: Thu Jul 22 10:56:02 2021 +0100
randr - allow custom names for screen (not output but model)
---
src/bin/e_randr2.c | 2 ++
src/bin/e_randr2.h | 2 ++
src/modules/conf_randr/e_int_config_randr2.c | 31 ++--
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_randr2.c b/src/bin/e_randr2.c
index 5eef77e13..ae05a18ba 100644
--- a/src/bin/e_randr2.c
+++ b/src/bin/e_randr2.c
@@ -77,6 +77,7 @@ e_randr2_init(void)
E_CONFIG_VAL(D, T, rel_mode, UCHAR);
E_CONFIG_VAL(D, T, enabled, UCHAR);
E_CONFIG_VAL(D, T, ignore_disconnect, UCHAR);
+ E_CONFIG_VAL(D, T, custom_label_screen, STR);
E_CONFIG_VAL(D, T, profile, STR);
E_CONFIG_VAL(D, T, scale_multiplier, DOUBLE);
@@ -411,6 +412,7 @@ _config_free(E_Config_Randr2 *cfg)
{
eina_stringshare_del(cs->id);
eina_stringshare_del(cs->rel_to);
+eina_stringshare_del(cs->custom_label_screen);
eina_stringshare_del(cs->profile);
free(cs);
}
diff --git a/src/bin/e_randr2.h b/src/bin/e_randr2.h
index 5f9f0b371..70d27c092 100644
--- a/src/bin/e_randr2.h
+++ b/src/bin/e_randr2.h
@@ -120,6 +120,8 @@ struct _E_Config_Randr2_Screen
unsigned char enabled;
unsigned char ignore_disconnect;
+ const char*custom_label_screen; // name of the screen device attached
+
const char*profile;
double scale_multiplier;
};
diff --git a/src/modules/conf_randr/e_int_config_randr2.c
b/src/modules/conf_randr/e_int_config_randr2.c
index e33eefe4f..9f2163b41 100644
--- a/src/modules/conf_randr/e_int_config_randr2.c
+++ b/src/modules/conf_randr/e_int_config_randr2.c
@@ -120,6 +120,7 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED,
E_Config_Dialog_Data *cfdata)
{
eina_stringshare_del(cs->id);
eina_stringshare_del(cs->rel_to);
+eina_stringshare_del(cs->custom_label_screen);
eina_stringshare_del(cs->profile);
free(cs);
}
@@ -364,11 +365,15 @@ _basic_screen_info_fill(E_Config_Dialog_Data *cfdata,
E_Config_Randr2_Screen *cs
Elm_Object_Item *it, *it_sel;
Elm_Widget_Item *iwt;
void *dt;
+ const char *info_screen = "";
if (!s) return;
// fill all the screen status info
+ info_screen = s->info.screen;
+ if ((cs->custom_label_screen) && (cs->custom_label_screen[0])) info_screen
= cs->custom_label_screen;
+ printf("RRR: [%s] [%s]", s->info.name, info_screen);
elm_object_text_set(cfdata->name_obj, s->info.name);
- elm_object_text_set(cfdata->screen_obj, s->info.screen);
+ elm_object_text_set(cfdata->screen_obj, info_screen);
elm_check_state_set(cfdata->lid_obj, s->info.is_lid);
elm_check_state_set(cfdata->backlight_obj, s->info.backlight);
snprintf(buf, sizeof(buf), "%imm x %imm", s->info.size.w, s->info.size.h);
@@ -760,6 +765,18 @@ _cb_enabled_changed(void *data, Evas_Object *obj, void
*event EINA_UNUSED)
e_config_dialog_changed_set(cfdata->cfd, EINA_TRUE);
}
+static void
+_cb_label_screen_edited(void *data, Evas_Object *obj, void *event EINA_UNUSED)
+{
+ E_Config_Dialog_Data *cfdata = data;
+ E_Config_Randr2_Screen *cs = _config_screen_find(cfdata);
+ const char *str = elm_object_text_get(obj);
+ if (!cs) return;
+ printf("RR: change screen [%s]\n", str);
+ eina_stringshare_replace(&(cs->custom_label_screen), str);
+ e_config_dialog_changed_set(cfdata->cfd, EINA_TRUE);
+}
+
static void
_cb_ignore_disconnect_changed(void *data, Evas_Object *obj, void *event
EINA_UNUSED)
{
@@ -876,7 +893,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas EINA_UNUSED,
E_Config_Dialog_Data
if (s->info.connected)
{
- E_Config_Randr2_Screen *cs;
+ E_Config_Randr2_Screen *cs, *cs2;
cs = calloc(1, sizeof(E_Config_Randr2_Screen));
if (cs)
@@ -896,6 +913,12 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas
EINA_UNUSED, E_Config_Dialog_Data
cs->ignore_disconnect = s->config.ignore_disconnect;
if (s->config.profile)
cs->profile = eina_stringshare_add(s->config.profile);
+ if (e_randr2_cfg)
+{
+ cs2 = e_randr2_config_screen_find(s, e_randr2_cfg);
+ if ((cs2) && (cs2->custom_label_screen) &&
(cs2->custom_label_screen[0]))
+ cs->custom_label_screen =
eina_stringshare_add(cs2->custom_label_screen);
+}
cs->scale_multipl
[EGIT] [core/efl] master 01/01: elm theme - add lock and unlock icons
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a5a35217292e73f0ed14d21f29d09e93a08b9ee1
commit a5a35217292e73f0ed14d21f29d09e93a08b9ee1
Author: Carsten Haitzler
Date: Wed Jul 21 11:07:37 2021 +0100
elm theme - add lock and unlock icons
---
data/elementary/themes/edc/icons.edc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/data/elementary/themes/edc/icons.edc
b/data/elementary/themes/edc/icons.edc
index 9ac95ce10e..d7fe8f4378 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -1052,6 +1052,9 @@ ICON("emblem-system", "i-emblem-system")
ICON("emblem-synchronized", "i-emblem-synchronized")
ICON("emblem-synchronizing", "i-emblem-synchronizing")
+ICON("lock", "i-padlock-lock")
+ICON("unlock", "i-padlock-unlock")
+
#undef ICON
// flags
--
[EGIT] [core/enlightenment] master 01/01: askpass - pretty up a bit
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=a5efea6b522d850eea5f37bfeaafc5ce9e9d288e
commit a5efea6b522d850eea5f37bfeaafc5ce9e9d288e
Author: Carsten Haitzler
Date: Wed Jul 21 11:07:58 2021 +0100
askpass - pretty up a bit
---
src/bin/tools/askpass/e_askpass_main.c | 68 --
1 file changed, 49 insertions(+), 19 deletions(-)
diff --git a/src/bin/tools/askpass/e_askpass_main.c
b/src/bin/tools/askpass/e_askpass_main.c
index f16f460db..82e895d8a 100644
--- a/src/bin/tools/askpass/e_askpass_main.c
+++ b/src/bin/tools/askpass/e_askpass_main.c
@@ -8,6 +8,7 @@
#define GUIDE_PWD "Password"
#define OK "OK"
#define CANCEL "Cancel"
+#define PADOUT "pad_large"
#define PAD"pad_medium"
int ret = -1;
@@ -46,7 +47,7 @@ cb_cancel(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_info
EAPI int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bx, *fr, *lab, *en, *sep, *bx2, *bt;
+ Evas_Object *win, *bx, *fr, *bxv, *bxh, *fr2, *ic, *lab, *en, *sep, *bx2,
*bt;
const char *txt = NULL;
Eina_Bool askpass = EINA_TRUE;
@@ -82,25 +83,50 @@ elm_main(int argc, char **argv)
{
fr = elm_frame_add(win);
evas_object_size_hint_align_set(fr, EVAS_HINT_FILL,
EVAS_HINT_FILL);
-elm_object_style_set(fr, PAD);
+elm_object_style_set(fr, PADOUT);
elm_box_pack_end(bx, fr);
+
+bxv = elm_box_add(win);
+elm_box_horizontal_set(bxv, EINA_FALSE);
+evas_object_size_hint_align_set(bxv, EVAS_HINT_FILL,
EVAS_HINT_FILL);
+elm_object_content_set(fr, bxv);
+
+bxh = elm_box_add(win);
+elm_box_horizontal_set(bxh, EINA_TRUE);
+evas_object_size_hint_align_set(bxh, EVAS_HINT_FILL,
EVAS_HINT_FILL);
+elm_box_pack_end(bxv, bxh);
{
- lab = elm_label_add(win);
- evas_object_size_hint_align_set(lab, EVAS_HINT_FILL, 0.5);
- if (txt)
- elm_object_text_set(lab, txt);
- else
- elm_object_text_set(lab, TEXT);
- elm_object_content_set(fr, lab);
- evas_object_show(lab);
+ fr2 = elm_frame_add(win);
+ evas_object_size_hint_align_set(fr2, EVAS_HINT_FILL,
EVAS_HINT_FILL);
+ elm_object_style_set(fr2, PAD);
+ elm_box_pack_end(bxh, fr2);
+ {
+ ic = elm_icon_add(win);
+ elm_icon_standard_set(ic, "lock");
+ evas_object_size_hint_min_set(ic, ELM_SCALE_SIZE(40),
ELM_SCALE_SIZE(40));
+ elm_object_content_set(fr2, ic);
+ evas_object_show(ic);
+ }
+ evas_object_show(fr2);
+
+ fr2 = elm_frame_add(win);
+ evas_object_size_hint_align_set(fr2, EVAS_HINT_FILL,
EVAS_HINT_FILL);
+ elm_object_style_set(fr2, PAD);
+ elm_box_pack_end(bxh, fr2);
+ {
+ lab = elm_label_add(win);
+ evas_object_size_hint_align_set(lab, EVAS_HINT_FILL, 0.5);
+ if (txt) elm_object_text_set(lab, txt);
+ else elm_object_text_set(lab, TEXT);
+ elm_object_content_set(fr2, lab);
+ evas_object_show(lab);
+ }
+ evas_object_show(fr2);
}
-evas_object_show(fr);
- }
- {
-fr = elm_frame_add(win);
-evas_object_size_hint_align_set(fr, EVAS_HINT_FILL,
EVAS_HINT_FILL);
-elm_object_style_set(fr, PAD);
-elm_box_pack_end(bx, fr);
+fr2 = elm_frame_add(win);
+evas_object_size_hint_align_set(fr2, EVAS_HINT_FILL,
EVAS_HINT_FILL);
+elm_object_style_set(fr2, PAD);
+elm_box_pack_end(bxv, fr2);
{
en = elm_entry_add(win);
entry = en;
@@ -113,10 +139,14 @@ elm_main(int argc, char **argv)
elm_entry_password_set(en, askpass);
evas_object_smart_callback_add(en, "activated", cb_ok, NULL);
evas_object_smart_callback_add(en, "aborted", cb_cancel, NULL);
- elm_object_content_set(fr, en);
+ elm_object_content_set(fr2, en);
evas_object_show(en);
elm_object_focus_set(en, EINA_TRUE);
}
+evas_object_show(fr2);
+
+evas_object_show(bxh);
+evas_object_show(bxv);
evas_object_show(fr);
}
{
@@ -130,7 +160,7 @@ elm_main(int argc, char **argv)
{
fr = elm_frame_add(win);
evas_object_size_hint_align_set(fr, EVAS_HINT_FILL,
EVAS_HINT_FILL);
-
[EGIT] [core/efl] master 01/01: elm theme - more cc fixing
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b8004542bd973aeaf429580f4496f4d379a5d00f
commit b8004542bd973aeaf429580f4496f4d379a5d00f
Author: Carsten Haitzler
Date: Sun Jul 18 03:01:13 2021 +0100
elm theme - more cc fixing
---
data/elementary/themes/colorclasses.edc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 6029e4c607..504bae75ba 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -605,7 +605,7 @@ color_classes {
color: 255 255 255 255; }
color_class { name: "/fg/pressed/gadgets/music_control/button";
color: 255 255 255 255; }
- color_class { name: "/fg/pressed/gadgets/music_control/progress";
+ color_class { name: "/fg/normal/gadgets/music_control/progress";
color: 51 153 255 255; }
color_class { name: "/fg/normal/gadgets/music_control/text";
color: 220 220 220 255; }
--
[EGIT] [core/efl] master 01/01: talk about confs/
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d1ce5d5dd07285a1ca5c9b6f13cf3a558c7bd614 commit d1ce5d5dd07285a1ca5c9b6f13cf3a558c7bd614 Author: Carsten Haitzler Date: Sun Jul 18 01:42:52 2021 +0100 talk about confs/ make that compile and install more std in readme --- README | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README b/README index 03085056d3..fa42e90e35 100644 --- a/README +++ b/README @@ -418,6 +418,9 @@ able to use the efl. COMPILING AND INSTALLING +For sample configuration options please look in the ./confs/ directory +for scripts that pass in commonly used options. + See the INSTALL file: https://git.enlightenment.org/core/efl.git/tree/INSTALL --
[EGIT] [core/enlightenment] master 01/01: talk about confs/
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=01a4b5ece224603375c6a8f82f63dce97ccb4719 commit 01a4b5ece224603375c6a8f82f63dce97ccb4719 Author: Carsten Haitzler Date: Sun Jul 18 01:42:40 2021 +0100 talk about confs/ make that compile and install more std in readme --- README | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README b/README index f32c73cb6..ff363fc88 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ Enlightenment Please report bugs and submit patches at https://phab.enlightenment.org -Requirements +REQUIREMENTS Must: @@ -22,11 +22,17 @@ Highly suggested: * udisks2 * gdb (If you want automatic bactraces in ~/.e-crashdump.txt) +COMPILING AND INSTALLING + + +For sample configuration options please look in the ./confs/ directory +for scripts that pass in commonly used options. + +Please see the INSTALL file: https://git.enlightenment.org/core/enlightenment.git/tree/INSTALL + NOTE: Users of DR16 will need to rename the $prefix/bin/enlightenment file prior to installing this release or it will be overwritten. -Please see the INSTALL file for now to compile and install it. - NOTE: If you do not want security issues make sure sysactions.conf is in /etc/enlightenment (not PREFIX/etc/enlightenment) as this is the first place it looks at. This file is intended to be customized by packagers and --
[EGIT] [core/enlightenment] master 01/01: todo++ - fprint in polkit auth
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=926a50d358ed3de61ea47e065f3a341358c84351 commit 926a50d358ed3de61ea47e065f3a341358c84351 Author: Carsten Haitzler Date: Sat Jul 17 23:32:30 2021 +0100 todo++ - fprint in polkit auth --- TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index 1d737073d..1c8bf8699 100644 --- a/TODO +++ b/TODO @@ -82,6 +82,7 @@ TODO: * support setting up face auth (howdy / pam-face / pam-face-authentication / pam-facial-auth) * support setting up yubikey as auth * support setting up usb drive for auth (pam_usb) + * support fprint auth for polkit agent (ugh) * wifi/bt net: associate app/desktop(s) or actions to run when: * bt device comes or goes (alongside lock device feature) * wifi appears or disappears --
[EGIT] [core/efl] master 01/01: elm theme - fix fprint icon to be recolored right
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=329266937a1e63e4e26f3e6c4f985e1adfbf91af
commit 329266937a1e63e4e26f3e6c4f985e1adfbf91af
Author: Carsten Haitzler
Date: Sat Jul 17 23:12:21 2021 +0100
elm theme - fix fprint icon to be recolored right
---
data/elementary/themes/edc/icons.edc | 7 +-
data/elementary/themes/ic.edc | 3 +-
data/elementary/themes/img/ic/fingerprint-040.png | Bin 2459 -> 1581 bytes
data/elementary/themes/img/ic/fingerprint-080.png | Bin 5835 -> 3759 bytes
data/elementary/themes/img/ic/fingerprint-160.png | Bin 12638 -> 8215 bytes
data/elementary/themes/img/svg/fingerprint.svg| 88 +++---
6 files changed, 67 insertions(+), 31 deletions(-)
diff --git a/data/elementary/themes/edc/icons.edc
b/data/elementary/themes/edc/icons.edc
index 52ee2c4778..9ac95ce10e 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -83,7 +83,6 @@ ICON("preferences-desktop-mouse-extra", "i-mouse-extra")
ICON("preferences-desktop-keyboard", "i-keyboard")
ICON("preferences-desktop-signal-bindings", "i-signal-bindings")
ICON("preferences-behavior", "i-input")
-ICON("preferences-interaction", "i-fingerprint") // pretty bad for touch icon
- FIXME
ICON("preferences-focus", "i-window-focus")
ICON("preferences-window-geometry", "i-window-geometry")
ICON("preferences-desktop-window-remember", "i-window-remember")
@@ -217,6 +216,10 @@ ICON("preferences-position-left-bottom", "i-shelf-lb")
ICON("preferences-position-right-top", "i-shelf-rt")
ICON("preferences-position-right", "i-shelf-rc")
ICON("preferences-position-right-bottom", "i-shelf-rb")
+
+ICON("preferences-interaction", "i-fingerprint") // pretty bad for touch icon
- FIXME
+
+ICON("fprint", "i-fingerprint")
#undef ICON
// mono border action icons
@@ -724,6 +727,8 @@ ICON("non-starred", "i-star-off")
ICON("utilities-terminal", "i-termprompt")
+ICON("fprint", "i-fingerprint")
+
#undef ICON
// regular icons
diff --git a/data/elementary/themes/ic.edc b/data/elementary/themes/ic.edc
index 8a612465f0..44e0083703 100644
--- a/data/elementary/themes/ic.edc
+++ b/data/elementary/themes/ic.edc
@@ -275,7 +275,6 @@ I160("i-screen-around", "screen-around")
I160("i-bulb", "bulb")
I160("i-key", "key")
I160("i-gesture", "gesture")
-I160("i-fingerprint", "fingerprint")
I160("i-mouse", "mouse")
I160("i-keyboard", "keyboard")
I160("i-input", "input")
@@ -538,6 +537,8 @@ I160("i-system-lock", "system-lock")
I160("i-system-logout", "system-logout")
I160("i-enlightenment", "enlightenment")
+I160("i-fingerprint", "fingerprint")
+
///
// misc larger icons
I160("i-unknown", "unknown")
diff --git a/data/elementary/themes/img/ic/fingerprint-040.png
b/data/elementary/themes/img/ic/fingerprint-040.png
index 9ce6eb4038..6ba039055e 100644
Binary files a/data/elementary/themes/img/ic/fingerprint-040.png and
b/data/elementary/themes/img/ic/fingerprint-040.png differ
diff --git a/data/elementary/themes/img/ic/fingerprint-080.png
b/data/elementary/themes/img/ic/fingerprint-080.png
index 85cca0d154..a72811fcd7 100644
Binary files a/data/elementary/themes/img/ic/fingerprint-080.png and
b/data/elementary/themes/img/ic/fingerprint-080.png differ
diff --git a/data/elementary/themes/img/ic/fingerprint-160.png
b/data/elementary/themes/img/ic/fingerprint-160.png
index e3d40b39f2..55a11eb5e5 100644
Binary files a/data/elementary/themes/img/ic/fingerprint-160.png and
b/data/elementary/themes/img/ic/fingerprint-160.png differ
diff --git a/data/elementary/themes/img/svg/fingerprint.svg
b/data/elementary/themes/img/svg/fingerprint.svg
index b8010a256a..85659ebdec 100644
--- a/data/elementary/themes/img/svg/fingerprint.svg
+++ b/data/elementary/themes/img/svg/fingerprint.svg
@@ -1,22 +1,22 @@
http://purl.org/dc/elements/1.1/;
- xmlns:cc="http://creativecommons.org/ns#;
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#;
- xmlns:svg="http://www.w3.org/2000/svg;
- xmlns="http://www.w3.org/2000/svg;
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape;
version="1.1"
id="svg2"
[EGIT] [core/efl] master 01/01: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=be505919e4cff1247b29cc268108bf08abb3e1b6
commit be505919e4cff1247b29cc268108bf08abb3e1b6
Author: Carsten Haitzler
Date: Thu Jul 15 18:54:38 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 12
data/elementary/themes/edc/wallpaper.edc | 54 +++--
data/elementary/themes/edc/winlist.edc | 99 +++-
data/elementary/themes/edc/wizard.edc| 27 -
data/elementary/themes/edc/xkbswitch.edc | 41 ++---
5 files changed, 141 insertions(+), 92 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index dfcad9dd5f..6029e4c607 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -433,6 +433,18 @@ color_classes {
///
color_class { name: "/bg/selected/toolbar/base";
color: 32 32 32 255; }
+///
+ color_class { name: "/fg/normal/winlist/text/title";
+ color: 255 255 255 255; }
+ color_class { name: "/bg/selected/winlist/item/base";
+ color: 32 32 32 255; }
+ color_class { name: "/fg/normal/winlist/item/text/iconified";
+ color: 96 96 96 255; }
+ color_class { name: "/fg/selected/winlist/item/text/iconified";
+ color: 160 160 160 255; }
+///
+ color_class { name: "/fg/normal/wizard/text/title";
+ color: 255 255 255 255; }
///
color_class { name: "/fg/normal/gadgets/temperature/low";
color: 51 153 255 255; }
diff --git a/data/elementary/themes/edc/wallpaper.edc
b/data/elementary/themes/edc/wallpaper.edc
index ea4be80fad..108bd6da7d 100644
--- a/data/elementary/themes/edc/wallpaper.edc
+++ b/data/elementary/themes/edc/wallpaper.edc
@@ -5,7 +5,7 @@
parts {
part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- color: 64 64 64 255;
+ color_class: "/bg/normal/conf/wallpaper/base";
}
}
part { name: "e.swallow.preview"; type: SWALLOW;
@@ -20,22 +20,25 @@
}
part { name: "events"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
}
part { name: "bot1"; type: RECT; mouse_events: 0;
+scale: 1;
description { state: "default" 0.0;
- color: 64 64 64 255;
+ color_class: "/bg-dark/normal/conf/wallpaper/bottom";
rel1 {
to_y: "e.swallow.buttons";
relative: 0.0 0.0;
offset: 0 -8;
}
+ offscale;
}
}
part { name: "e.text.filename"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
+ color_class: "/fg/normal/conf/wallpaper/text";
fixed: 0 1;
rel1 { to: "bot1";
offset: 4 4;
@@ -43,7 +46,7 @@
rel2 { to: "bot1";
offset: -5 -5;
}
- color: 255 255 255 255;
+ offscale;
text {
font: FN;
size: 10;
@@ -54,6 +57,7 @@
}
}
part { name: "e.swallow.buttons"; type: SWALLOW;
+scale: 1;
description { state: "default" 0.0;
align: 1.0 1.0;
fixed: 1 1;
@@ -65,11 +69,12 @@
relative: 1.0 1.0;
offset: -8 -8;
}
+ offscale;
}
}
part { name: "cover"; type: RECT;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
visible: 0;
}
description { state: "out" 0.0;
@@ -78,8 +83,9 @@
}
}
part { name: "extas_base"; type: RECT;
+scale: 1;
description { state: "default" 0.0;
- color: 64 64 64 255;
+ color_class: "/bg/normal/conf/wallpaper/extras";
rel1 {
to: "e.swallow.extras";
[EGIT] [core/enlightenment] master 01/01: efm - fix exif data parse - do by hand because sscanf is stupid
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ce933dd5c17e0ed0c4c34e1ac7d37af51d4cd082
commit ce933dd5c17e0ed0c4c34e1ac7d37af51d4cd082
Author: Carsten Haitzler
Date: Wed Jul 14 17:35:47 2021 +0100
efm - fix exif data parse - do by hand because sscanf is stupid
:)
---
src/bin/e_fm_prop.c | 62 ++---
1 file changed, 59 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_fm_prop.c b/src/bin/e_fm_prop.c
index 14347647d..de52ecdb8 100644
--- a/src/bin/e_fm_prop.c
+++ b/src/bin/e_fm_prop.c
@@ -138,6 +138,64 @@ _exif_entry_find(ExifData *ed, ExifTag tag)
#endif
/**--CREATE--**/
+#ifdef HAVE_LIBEXIF
+static inline int
+_parse_exif_digit(char c)
+{
+ if ((c >= '0') && (c <= '9')) return (c - '0');
+ return -1;
+}
+
+static inline int
+_parse_digits(const char **s, char end)
+{
+ int vnow = 0, v;
+
+ for (;;)
+ {
+v = _parse_exif_digit(**s);
+if (v < 0)
+ {
+ if (**s != end) return -1;
+ (*s)++;
+ return vnow;
+ }
+else vnow = (vnow * 10) + v;
+if (!(**s)) return -1;
+(*s)++;
+ }
+ return vnow;
+}
+
+static int
+_parse_exif_time(const char *str, struct tm *tm)
+{
+ const char *s;
+ int v;
+
+ s = str;
+ v = _parse_digits(, ':');
+ if (v < 0) return -1;
+ tm->tm_year = v;
+ v = _parse_digits(, ':');
+ if (v < 0) return -1;
+ tm->tm_mon = v;
+ v = _parse_digits(, ' ');
+ if (v < 0) return -1;
+ tm->tm_mday = v;
+ v = _parse_digits(, ':');
+ if (v < 0) return -1;
+ tm->tm_hour = v;
+ v = _parse_digits(, ':');
+ if (v < 0) return -1;
+ tm->tm_min = v;
+ v = _parse_digits(, 0);
+ if (v < 0) return -1;
+ tm->tm_sec = v;
+ return 0;
+}
+#endif
+
static void
_fill_data(E_Config_Dialog_Data *cfdata, E_Fm2_Icon *ic)
{
@@ -171,9 +229,7 @@ _fill_data(E_Config_Dialog_Data *cfdata, E_Fm2_Icon *ic)
memset(, 0, sizeof(tm));
tm.tm_isdst = -1;
// ":MM:DD HH:MM:SS"
- if (sscanf(tbuf, "%i:%i:%i %i:%i:%i",
-_year, _mon, _mday,
-_hour, _min, _sec) == 6)
+ if (_parse_exif_time(tbuf, ) == 0)
{
tm.tm_year -= 1900;
tm.tm_mon -= 1;
--
[EGIT] [core/enlightenment] master 01/01: client list - other prop - not just stacking, keep internal wins out
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=571a188eb0da3cb396c371c5bbe1a05aaa520280
commit 571a188eb0da3cb396c371c5bbe1a05aaa520280
Author: Carsten Haitzler
Date: Tue Jul 13 20:05:05 2021 +0100
client list - other prop - not just stacking, keep internal wins out
---
src/bin/e_hints.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index ae22da05b..42e75db5c 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -315,12 +315,17 @@ e_hints_client_list_set(void)
{
E_Client *ec;
const Eina_List *ll;
+const char *name;
clients = calloc(e_clients_count(), sizeof(Ecore_X_Window));
EINA_LIST_FOREACH(e_comp->clients, ll, ec)
{
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_X) continue;
- clients[i++] = e_client_util_win_get(ec);
+ name = evas_object_name_get(ec->frame);
+ if (!((name) && (!strcmp(name, "layer_obj"
+ {
+ clients[i++] = e_client_util_win_get(ec);
+ }
}
}
ecore_x_netwm_client_list_set(e_comp->root, clients, i);
--
[EGIT] [core/enlightenment] master 01/01: e - netwm - dont include intnernal marker layer clients in clients prop
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=b2e79f46c8307989bb582f695c197933673a6dcf
commit b2e79f46c8307989bb582f695c197933673a6dcf
Author: Carsten Haitzler
Date: Tue Jul 13 19:53:44 2021 +0100
e - netwm - dont include intnernal marker layer clients in clients prop
---
src/bin/e_hints.c | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index 7e7bf3501..ae22da05b 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -335,8 +335,9 @@ e_hints_client_stacking_set(void)
{
#ifdef HAVE_WAYLAND_ONLY
#else
- unsigned int c, i = 0, non_x = 0;
+ unsigned int c, i = 0, non_x = 0, count = 0;
Ecore_X_Window *clients = NULL;
+ const char *name;
//#define CLIENT_STACK_DEBUG
/* Get client count */
@@ -355,7 +356,12 @@ e_hints_client_stacking_set(void)
non_x++;
continue;
}
- clients[i++] = e_client_util_win_get(ec);
+ name = evas_object_name_get(ec->frame);
+ if (!((name) && (!strcmp(name, "layer_obj"
+ {
+ clients[i++] = e_client_util_win_get(ec);
+ count++;
+ }
#ifdef CLIENT_STACK_DEBUG
ll = eina_list_append(ll, ec);
#endif
@@ -384,7 +390,7 @@ e_hints_client_stacking_set(void)
* to be returned in the list
*/
if (i <= c)
- ecore_x_netwm_client_list_stacking_set(e_comp->root, clients, c);
+ ecore_x_netwm_client_list_stacking_set(e_comp->root, clients, count);
free(clients);
#endif
}
--
[EGIT] [apps/rage] master 01/01: video smart - we dont need to handle the move func - smart clipped does
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=7d7c825ecd808fb4caccf13e23cc90a5c0d833e5
commit 7d7c825ecd808fb4caccf13e23cc90a5c0d833e5
Author: Carsten Haitzler (Rasterman)
Date: Fri Jul 9 11:35:34 2021 +0100
video smart - we dont need to handle the move func - smart clipped does
---
src/bin/video.c | 16 +++-
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/bin/video.c b/src/bin/video.c
index dc8fa30..25f6842 100644
--- a/src/bin/video.c
+++ b/src/bin/video.c
@@ -409,9 +409,9 @@ _smart_add(Evas_Object *obj)
_parent_sc.add(obj);
o = evas_object_rectangle_add(evas_object_evas_get(obj));
+ evas_object_color_set(o, 255, 255, 255, 255);
evas_object_smart_member_add(o, obj);
sd->clip = o;
- evas_object_color_set(o, 255, 255, 255, 255);
}
static void
@@ -450,12 +450,11 @@ static void
_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
Video *sd = evas_object_smart_data_get(obj);
- Evas_Coord ox, oy, ow, oh;
+ Evas_Coord ow, oh;
if (!sd) return;
- evas_object_geometry_get(obj, , , , );
+ evas_object_geometry_get(obj, NULL, NULL, , );
if ((ow == w) && (oh == h)) return;
evas_object_smart_changed(obj);
- evas_object_resize(sd->clip, ow, oh);
}
static Eina_Bool
@@ -523,14 +522,6 @@ _smart_calculate(Evas_Object *obj)
evas_object_resize(sd->clip, ow, oh);
}
-static void
-_smart_move(Evas_Object *obj, Evas_Coord x EINA_UNUSED, Evas_Coord y
EINA_UNUSED)
-{
- Video *sd = evas_object_smart_data_get(obj);
- if (!sd) return;
- evas_object_smart_changed(obj);
-}
-
static void
_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event)
{
@@ -574,7 +565,6 @@ _smart_init(void)
sc.add = _smart_add;
sc.del = _smart_del;
sc.resize= _smart_resize;
- sc.move = _smart_move;
sc.calculate = _smart_calculate;
_smart = evas_smart_class_new();
}
--
[EGIT] [core/enlightenment] master 01/01: xkb settings - fix typo copy & paste for advanced add ctrl opts
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=7d694d6eea4a599f7d60af4c38f12a6d01fc57fa
commit 7d694d6eea4a599f7d60af4c38f12a6d01fc57fa
Author: Carsten Haitzler
Date: Thu Jul 8 17:50:36 2021 +0100
xkb settings - fix typo copy & paste for advanced add ctrl opts
this fixes T8947
@fix
---
src/modules/xkbswitch/e_mod_config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/xkbswitch/e_mod_config.c
b/src/modules/xkbswitch/e_mod_config.c
index 4e9a48e2c..534cb2f12 100644
--- a/src/modules/xkbswitch/e_mod_config.c
+++ b/src/modules/xkbswitch/e_mod_config.c
@@ -1078,7 +1078,7 @@ _cb_ctrl_up(void *data, Evas_Object *obj EINA_UNUSED,
void *event EINA_UNUSED)
if (!(cfdata = data)) return;
- _popup_add(_("Switch Layout"), cfdata, optswitch,
+ _popup_add(_("Control"), cfdata, optctrl,
>cfg_ctrl_options, cfdata->ctrl_list);
}
--
[EGIT] [core/efl] master 03/04: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=53801eb1b8c93cc28c7e64cb32d5036dc65fc2af
commit 53801eb1b8c93cc28c7e64cb32d5036dc65fc2af
Author: Carsten Haitzler
Date: Thu Jul 8 13:28:43 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc| 33
data/elementary/themes/edc/sys.edc | 8 +++---
data/elementary/themes/edc/systray.edc | 10 +---
data/elementary/themes/edc/tasks.edc | 40 --
data/elementary/themes/edc/temperature.edc | 37 ---
data/elementary/themes/edc/tiling.edc | 26 ---
data/elementary/themes/edc/transitions.edc | 22
7 files changed, 99 insertions(+), 77 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 26b363a4c2..422069dce3 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -70,6 +70,11 @@ color_classes {
///
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
+///
+ color_class { name: "/bg/normal/tiling/position/base";
+ color: 51 153 255 25; }
+ color_class { name: "/bg/normal/tiling/position/outline";
+ color: 51 153 255 255; }
///
color_class { name: "/fg/normal/init/logo";
color: 255 255 255 255; }
@@ -427,6 +432,34 @@ color_classes {
///
color_class { name: "/fg/selected/edgebindings/edge";
color: 51 153 255 255; }
+///
+ color_class { name: "/fg/normal/gadgets/temperature/low";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/gadgets/temperature/medium";
+ color: 255 153 51 255; }
+ color_class { name: "/fg/normal/gadgets/temperature/hi";
+ color: 255 51 51 255; }
+///
+ color_class { name: "/bg/normal/gadgets/tasks/base/normal";
+ color: 64 64 64 255; }
+ color_class { name: "/bg/normal/gadgets/tasks/base/iconified";
+ color: 64 64 64 255; }
+ color_class { name: "/bg/normal/gadgets/tasks/base/focused";
+ color: 32 32 32 255; }
+ color_class { name: "/bg/pressed/gadgets/tasks/base";
+ color: 16 16 16 255; }
+ color_class { name: "/bg/selected/gadgets/tasks/bar";
+ color: 51 153 255 255; }
+ color_class { name: "/bg/selected/gadgets/tasks/urgent";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/gadgets/tasks/text/focused";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/pressed/gadgets/tasks/text/focused";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/gadgets/tasks/text/iconified";
+ color: 128 128 128 255; }
+ color_class { name: "/fg/pressed/gadgets/tasks/text/iconified";
+ color: 160 160 160 255; }
///
color_class { name: "/bg/normal/gadgets/control/base";
color: 51 153 255 255; }
diff --git a/data/elementary/themes/edc/sys.edc
b/data/elementary/themes/edc/sys.edc
index 9e79a2b95e..6f6840c5f1 100644
--- a/data/elementary/themes/edc/sys.edc
+++ b/data/elementary/themes/edc/sys.edc
@@ -7,18 +7,18 @@ group { name: "e/sys/logout";
styles {
style { name: "sys_style";
- base: "font="FN" font_size=10 text_class=tb_plain align=left
color=#a0a0a0 wrap=word";
+ base: "font="FN" font_size=10 text_class=tb_plain align=left
color=cc:/fg/normal/sys/text wrap=word";
tag: "br" "\n";
tag: "b" "+ font="FNBD"";
tag: "hilight" "+ font="FNBD" text_class=tb_light";
- tag: "urgent" "+ font="FNBD" color=#fa4";
- tag: "title" "+ font="FNBD" font_size=16 underline=on
underline_color=#3399ff";
+ tag: "urgent" "+ font="FNBD" color=cc:/fg/normal/sys/text/urgent";
+ tag: "title" "+ font="FNBD" font_size=16 underline=on
underline_color=cc:/fg/normal/sys/text/title/underline";
}
}
parts {
part { name: "bg"; type: RECT; mouse_events:
[EGIT] [core/efl] master 02/04: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=33a5a94e4c2f4efad36e95a5ad94dfaaf5ba09b5
commit 33a5a94e4c2f4efad36e95a5ad94dfaaf5ba09b5
Author: Carsten Haitzler
Date: Thu Jul 8 11:08:17 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 12 +
data/elementary/themes/edc/slider.edc | 96 ++---
data/elementary/themes/edc/spectrum.edc | 10 ++--
data/elementary/themes/edc/start.edc| 7 ++-
data/elementary/themes/edc/syscon.edc | 32 +--
5 files changed, 76 insertions(+), 81 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 89e5bae56d..26b363a4c2 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -64,6 +64,9 @@ color_classes {
///
color_class { name: "/fg/normal/scroller/bar";
color: 51 153 255 255; }
+///
+ color_class { name: "/fg/normal/color/cursor";
+ color: 255 255 255 192; }
///
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
@@ -140,6 +143,15 @@ color_classes {
///
color_class { name: "/fg/normal/separator";
color: 80 80 80 255; }
+///
+ color_class { name: "/bg/normal/slider/base";
+ color: 48 48 48 255; }
+ color_class { name: "/bg/disabled/slider/base";
+ color: 56 56 56 255; }
+ color_class { name: "/fg/normal/slider/bar";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/disabled/slider/bar";
+ color: 80 80 80 255; }
///
color_class { name: "/bg/normal/entry";
color: 48 48 48 255; }
diff --git a/data/elementary/themes/edc/slider.edc
b/data/elementary/themes/edc/slider.edc
index 8af62471a9..c1ebe764ec 100644
--- a/data/elementary/themes/edc/slider.edc
+++ b/data/elementary/themes/edc/slider.edc
@@ -5,7 +5,7 @@ group { name: "e/widgets/slider_horizontal";
scale: 1;
description { state: "default" 0.0;
min: 56 28;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
offscale;
}
description { state: "active" 0.0;
@@ -18,16 +18,15 @@ group { name: "e/widgets/slider_horizontal";
part { name: "base"; type: RECT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
-rel1.to: "bg";
-rel2.to: "bg";
-color: 48 48 48 255;
+rel.to: "bg";
+color_class: "/bg/normal/slider/base";
min: 8 4;
max: 9 4;
fixed: 0 1;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
-color: 56 56 56 255;
+color_class: "/bg/disabled/slider/base";
}
}
part { name: "glow"; type: RECT; mouse_events: 0;
@@ -36,11 +35,11 @@ group { name: "e/widgets/slider_horizontal";
rel2.relative: 0.5 1.0;
rel2.to_x: "knob";
rel2.to_y: "base";
-color: 53 153 255 255;
+color_class: "/fg/normal/slider/bar";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
-color: 192 192 192 64;
+color_class: "/fg/disabled/slider/bar";
}
}
part { name: "clip1"; type: RECT;
@@ -59,7 +58,7 @@ group { name: "e/widgets/slider_horizontal";
rel1.relative: 1.0 0.0;
rel2.offset: -5 -5;
align: 1.0 0.5;
-color: 160 160 160 255;
+color_class: "/fg/normal/slider/text";
text { font: FN; size: 10;
min: 0 1;
align: 0.0 0.5;
@@ -91,9 +90,8 @@ group { name: "e/widgets/slider_horizontal";
clip_to: "clip2";
scale: 1;
description { state: "default" 0.0;
-rel1.to: "e.text.label";
-rel2.to: "e.text.label";
-color: 96 96 96 255;
+rel.to: "e.text.label";
+color_class: "/fg/disabled/slider/text";
text { fon
[EGIT] [core/efl] master 04/04: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d6a896ef96db482ef11cb4ab5325ffa1f2ebe35f
commit d6a896ef96db482ef11cb4ab5325ffa1f2ebe35f
Author: Carsten Haitzler
Date: Thu Jul 8 14:02:33 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 13 +++--
data/elementary/themes/edc/conf.edc | 1 -
data/elementary/themes/edc/elm/button.edc | 6 +-
data/elementary/themes/edc/toolbar.edc| 97 ---
4 files changed, 47 insertions(+), 70 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 422069dce3..dfcad9dd5f 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -44,7 +44,11 @@ color_classes {
color: 0 0 0 64; }
///
color_class { name: "/dim";
+ color: 0 0 0 160; }
+ color_class { name: "/dim/pressed";
color: 0 0 0 200; }
+ color_class { name: "/dim/disabled";
+ color: 0 0 0 80; }
///
color_class { name: "/fg/normal/menu/title";
color: 255 255 255 255; }
@@ -210,12 +214,6 @@ color_classes {
color: 255 255 255 255; }
color_class { name: "/fg/disabled/button";
color: 97 96 96 255; }
- color_class { name: "/bg/normal/button-overlay";
- color: 0 0 0 160; }
- color_class { name: "/bg/pressed/button-overlay";
- color: 0 0 0 200; }
- color_class { name: "/bg/disabled/button-overlay";
- color: 0 0 0 80; }
color_class { name: "/fg/normal/button-anchor";
color: 51 153 255 255; }
color_class { name: "/fg/pressed/button-anchor";
@@ -432,6 +430,9 @@ color_classes {
///
color_class { name: "/fg/selected/edgebindings/edge";
color: 51 153 255 255; }
+///
+ color_class { name: "/bg/selected/toolbar/base";
+ color: 32 32 32 255; }
///
color_class { name: "/fg/normal/gadgets/temperature/low";
color: 51 153 255 255; }
diff --git a/data/elementary/themes/edc/conf.edc
b/data/elementary/themes/edc/conf.edc
index 7c66ee40da..4bbf4c2113 100644
--- a/data/elementary/themes/edc/conf.edc
+++ b/data/elementary/themes/edc/conf.edc
@@ -23,7 +23,6 @@ group { name: "e/widgets/configure/main";
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;
diff --git a/data/elementary/themes/edc/elm/button.edc
b/data/elementary/themes/edc/elm/button.edc
index 183998964b..0e95d1cecc 100644
--- a/data/elementary/themes/edc/elm/button.edc
+++ b/data/elementary/themes/edc/elm/button.edc
@@ -611,15 +611,15 @@ group { name: "elm/button/base/overlay";
}
part { name: "base";
description { state: "default" 0.0;
-color_class: "/bg/normal/button-overlay";
+color_class: "/dim/normal/button-overlay";
visible: 1;
}
description { state: "pressed" 0.0;
-color_class: "/bg/pressed/button-overlay";
+color_class: "/dim/pressed/button-overlay";
visible: 1;
}
description { state: "disabled" 0.0;
-color_class: "/bg/disabled/button-overlay";
+color_class: "/dim/disabled/button-overlay";
visible: 0;
}
}
diff --git a/data/elementary/themes/edc/toolbar.edc
b/data/elementary/themes/edc/toolbar.edc
index 1456533e59..a4cc086c7d 100644
--- a/data/elementary/themes/edc/toolbar.edc
+++ b/data/elementary/themes/edc/toolbar.edc
@@ -2,13 +2,12 @@ group { name: "e/widgets/toolbar";
parts {
part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-color: 64 64 64 255;
+color_class: "/bg/normal/toolbar";
}
}
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
-rel1.to: "base";
-rel2.to: "base";
+rel.to: "base";
}
}
part { name: "e.swallow.content"; type: SWALLO
[EGIT] [core/efl] master 01/04: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f370184d04bc8ba543c4f8a1bcd7987a8192c8e7
commit f370184d04bc8ba543c4f8a1bcd7987a8192c8e7
Author: Carsten Haitzler
Date: Wed Jul 7 00:57:13 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 9
data/elementary/themes/edc/button.edc | 2 +-
data/elementary/themes/edc/colors.edc | 6 +--
data/elementary/themes/edc/comp_compat.edc | 10 ++--
data/elementary/themes/edc/connman.edc | 2 +-
data/elementary/themes/edc/cslider.edc | 2 +-
data/elementary/themes/edc/deskmirror.edc | 2 +-
data/elementary/themes/edc/fileman.edc | 2 +-
data/elementary/themes/edc/gadman.edc | 83 +++--
data/elementary/themes/edc/ibar-ibox.edc| 4 +-
data/elementary/themes/edc/ilist.edc| 2 +-
data/elementary/themes/edc/notification.edc | 2 +-
data/elementary/themes/edc/randr.edc| 2 +-
13 files changed, 70 insertions(+), 58 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 82c3374c0d..89e5bae56d 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -415,6 +415,15 @@ color_classes {
///
color_class { name: "/fg/selected/edgebindings/edge";
color: 51 153 255 255; }
+///
+ color_class { name: "/bg/normal/gadgets/control/base";
+ color: 51 153 255 255; }
+ color_class { name: "/bg/normal/gadgets/control/outline";
+ color: 51 153 255 255; }
+ color_class { name: "/bg/selected/gadgets/control/outline";
+ color: 255 255 255 255; }
+ color_class { name: "/bg/selected/gadgets/control/arrow";
+ color: 51 153 255 255; }
///
color_class { name: "/fg/normal/gadgets/ibar/text/text";
color: 255 255 255 255; }
diff --git a/data/elementary/themes/edc/button.edc
b/data/elementary/themes/edc/button.edc
index c0cd5b0341..09d15d3f05 100644
--- a/data/elementary/themes/edc/button.edc
+++ b/data/elementary/themes/edc/button.edc
@@ -122,7 +122,7 @@ group { name: "e/widgets/button";
ignore_flags: ON_HOLD;
description { state: "default" 0.0;
rel.to: "base";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
diff --git a/data/elementary/themes/edc/colors.edc
b/data/elementary/themes/edc/colors.edc
index 5a8e62da20..f00bbaaf06 100644
--- a/data/elementary/themes/edc/colors.edc
+++ b/data/elementary/themes/edc/colors.edc
@@ -74,7 +74,7 @@ group { name: "e/modules/conf_colors/preview/unknown";
}
part { name: "c1"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-color: 255 0 0 128;
+color: 255 0 0 128; // no cc
color_class: "color_preview_c1";
rel.to: "pat";
rel2.relative: 0.333 1.0;
@@ -82,7 +82,7 @@ group { name: "e/modules/conf_colors/preview/unknown";
}
part { name: "c2"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-color: 0 255 0 128;
+color: 0 255 0 128; // no cc
color_class: "color_preview_c2";
rel1.to: "c1";
rel1.relative: 1.0 0.0;
@@ -92,7 +92,7 @@ group { name: "e/modules/conf_colors/preview/unknown";
}
part { name: "c3"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-color: 0 0 255 128;
+color: 0 0 255 128; // no cc
color_class: "color_preview_c3";
rel1.to: "c2";
rel1.relative: 1.0 0.0;
diff --git a/data/elementary/themes/edc/comp_compat.edc
b/data/elementary/themes/edc/comp_compat.edc
index e1b2f18607..0a29fa72b7 100644
--- a/data/elementary/themes/edc/comp_compat.edc
+++ b/data/elementary/themes/edc/comp_compat.edc
@@ -321,12 +321,12 @@ group { name: "e/comp/border/fullscreen";
}
part { name: "scr_shade"; type: RECT;
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
-color: 0 0 0 255;
+color: 0 0 0 255; // no cc
visible: 1;
[EGIT] [core/enlightenment] master 01/01: auth - fprint - support any finger for auth instead of just first one
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=32e2825e93b2521d009ca6faf7ac8346082e6b14
commit 32e2825e93b2521d009ca6faf7ac8346082e6b14
Author: Carsten Haitzler
Date: Wed Jul 7 13:12:27 2021 +0100
auth - fprint - support any finger for auth instead of just first one
---
src/bin/e_auth.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c
index fa090f9c1..6d07a0ac3 100644
--- a/src/bin/e_auth.c
+++ b/src/bin/e_auth.c
@@ -144,7 +144,7 @@ _cb_verify_stop(void *data EINA_UNUSED, const
Eldbus_Message *m EINA_UNUSED,
if (m2)
{
iter = eldbus_message_iter_get(m2);
-eldbus_message_iter_basic_append(iter, 's', finger_name);
+eldbus_message_iter_basic_append(iter, 's', "any");
eldbus_proxy_send(proxy_fprint_device, m2, _cb_verify_start, NULL, -1);
}
}
--
[EGIT] [core/enlightenment] master 01/01: mixer - fix accesses to invalid objects
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=1fefd5aef96cb709783e82e85c67a4e3a5c92b78 commit 1fefd5aef96cb709783e82e85c67a4e3a5c92b78 Author: Carsten Haitzler Date: Wed Jul 7 11:11:05 2021 +0100 mixer - fix accesses to invalid objects one was a result of not turning off the source monitor and the other not nulling out an obj handle. --- src/modules/mixer/e_mod_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c index 175722cb1..c86b650e7 100644 --- a/src/modules/mixer/e_mod_main.c +++ b/src/modules/mixer/e_mod_main.c @@ -365,10 +365,12 @@ _popup_del(Instance *inst) inst->recslider = NULL; inst->reccheck = NULL; inst->recbx = NULL; + inst->recic = NULL; inst->recvu = NULL; inst->recording_box = NULL; emix_event_callback_del(_cb_emix_event, inst); if (inst->mon_data.sink) _sink_unmonitor(inst, inst->mon_data.sink); + if (inst->recmon_data.source) _source_unmonitor(inst, inst->recmon_data.source); E_FREE_FUNC(inst->popup, e_object_del); } @@ -693,6 +695,7 @@ _popup_recording_fill(Instance *inst) inst->recslider = NULL; inst->reccheck = NULL; inst->recbx = NULL; + inst->recic = NULL; inst->recvu = NULL; inst->recording_box = NULL; --
[EGIT] [core/enlightenment] master 01/01: auth - fprint - handle no finger reg and use default right index
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=28a43e0e7c68e13dca305847a64bc793a6edbade
commit 28a43e0e7c68e13dca305847a64bc793a6edbade
Author: Carsten Haitzler
Date: Tue Jul 6 22:54:53 2021 +0100
auth - fprint - handle no finger reg and use default right index
---
src/bin/e_auth.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c
index 5c1c1c686..fa090f9c1 100644
--- a/src/bin/e_auth.c
+++ b/src/bin/e_auth.c
@@ -138,7 +138,8 @@ _cb_verify_stop(void *data EINA_UNUSED, const
Eldbus_Message *m EINA_UNUSED,
Eldbus_Message *m2;
Eldbus_Message_Iter *iter;
- printf("FP: verify stop...\n");
+ printf("FP: verify stop finger_name=%s\n", finger_name ? finger_name :
"NULL");
+ if (!finger_name) finger_name = eina_stringshare_add("right-index-finger");
m2 = eldbus_proxy_method_call_new(proxy_fprint_device, "VerifyStart");
if (m2)
{
--
[EGIT] [core/efl] master 01/01: evas - tga - remove errant printf
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=24a17ee963e55612c74c8462734933b27a52d981
commit 24a17ee963e55612c74c8462734933b27a52d981
Author: Carsten Haitzler
Date: Mon Jul 5 16:01:37 2021 +0100
evas - tga - remove errant printf
---
src/modules/evas/image_loaders/tga/evas_image_load_tga.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/modules/evas/image_loaders/tga/evas_image_load_tga.c
b/src/modules/evas/image_loaders/tga/evas_image_load_tga.c
index 34ee83e0b1..71ad3ed361 100644
--- a/src/modules/evas/image_loaders/tga/evas_image_load_tga.c
+++ b/src/modules/evas/image_loaders/tga/evas_image_load_tga.c
@@ -141,7 +141,6 @@ evas_image_load_file_head_tga(void *loader_data,
// x origin gerater that width, y origin greater than height - wrong file
// if ((x >= w) || (y >= h))
// goto close_file;
- printf("x\n");
// if descriptor has either of the top 2 bits set... not tga
if (header->descriptor & 0xc0)
goto close_file;
--
[EGIT] [core/enlightenment] master 01/01: system ddc - more of a delay at start after modprobe
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=32d642d33882d3c2f15c1fdd2b3734c3c892a534
commit 32d642d33882d3c2f15c1fdd2b3734c3c892a534
Author: Carsten Haitzler
Date: Sun Jul 4 12:34:58 2021 +0100
system ddc - more of a delay at start after modprobe
it seems on starts while xrandr is busy talking to screens sometiems
one of my screens doesnt respond... unless we wait a bit. so .. wait
more.
---
src/bin/system/e_system_ddc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/system/e_system_ddc.c b/src/bin/system/e_system_ddc.c
index 25e65521b..7b12fc5f4 100644
--- a/src/bin/system/e_system_ddc.c
+++ b/src/bin/system/e_system_ddc.c
@@ -334,7 +334,7 @@ _ddc_init(void)
// brute force modprobe this as it likely is needed - probe will fail
// if this doesn't work or find devices anyway
if (system("modprobe i2c-dev") == 0)
- usleep(200 * 1000); // and wait for the module to come up... 200ms
+ usleep(500 * 1000); // and wait for the module to come up... 200ms
if (!_ddc_probe()) return EINA_FALSE;
--
[EGIT] [core/enlightenment] master 01/01: ddc - support latest major version
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=a197e3c1db3ec36da6a5445d2a54f58cfd5053d5
commit a197e3c1db3ec36da6a5445d2a54f58cfd5053d5
Author: Carsten Haitzler
Date: Sun Jul 4 10:05:50 2021 +0100
ddc - support latest major version
---
src/bin/system/e_system_ddc.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/bin/system/e_system_ddc.c b/src/bin/system/e_system_ddc.c
index c84d37d07..25e65521b 100644
--- a/src/bin/system/e_system_ddc.c
+++ b/src/bin/system/e_system_ddc.c
@@ -306,7 +306,9 @@ _ddc_init(void)
{
// .so.3 is ABI compatible twith .so.2 for out uses - see
// https://www.ddcutil.com/c_api_99/ for changes between them
- ddc_lib = dlopen("libddcutil.so.3", RTLD_NOW | RTLD_LOCAL);
+ ddc_lib = dlopen("libddcutil.so.4", RTLD_NOW | RTLD_LOCAL);
+ if (!ddc_lib)
+ ddc_lib = dlopen("libddcutil.so.3", RTLD_NOW | RTLD_LOCAL);
if (!ddc_lib)
ddc_lib = dlopen("libddcutil.so.2", RTLD_NOW | RTLD_LOCAL);
if (!ddc_lib) return EINA_FALSE;
--
[EGIT] [core/enlightenment] master 01/01: update todo - did fprint
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=de5f13df125c55947a636e042a7d3bb35278a532 commit de5f13df125c55947a636e042a7d3bb35278a532 Author: Carsten Haitzler Date: Sat Jul 3 15:19:31 2021 +0100 update todo - did fprint --- TODO | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/TODO b/TODO index e089bd0f6..1d737073d 100644 --- a/TODO +++ b/TODO @@ -73,13 +73,12 @@ TODO: * freeze the zooms like a screenshot/xmag like thing * offer coordinates and measuring by pixel * pam/auth - exotic auth things like fingerprint readers etc. need to work - * fingerprint * smart card * face auth (howdy / pam-face / pam-face-authentication / pam-facial-auth) * yubikey * usb drive (pam_usb) - * support setting up fingerprint as auth (fprint) - * support settign up smartcard as auth + * support setting up fingerprint as auth (fprint-enroll) + * support setting up smartcard as auth * support setting up face auth (howdy / pam-face / pam-face-authentication / pam-facial-auth) * support setting up yubikey as auth * support setting up usb drive for auth (pam_usb) --
[EGIT] [core/enlightenment] master 01/01: auth - fprint - only start after verify stop done
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=2fbbb52f942b88b200dc4ab7abf80aefc74970cb
commit 2fbbb52f942b88b200dc4ab7abf80aefc74970cb
Author: Carsten Haitzler
Date: Sat Jul 3 00:18:42 2021 +0100
auth - fprint - only start after verify stop done
---
src/bin/e_auth.c | 33 +
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c
index e18a868f4..5c1c1c686 100644
--- a/src/bin/e_auth.c
+++ b/src/bin/e_auth.c
@@ -126,23 +126,19 @@ _cb_verify_start(void *data EINA_UNUSED, const
Eldbus_Message *m,
printf("FP: verify start...\n");
if (eldbus_message_error_get(m, , ))
{
-fprintf(stderr, "Fprint err: %s %s\n", name, text);
+fprintf(stderr, "FP: Fprint err: %s %s\n", name, text);
return;
}
}
static void
-_verify_begin(void)
+_cb_verify_stop(void *data EINA_UNUSED, const Eldbus_Message *m EINA_UNUSED,
+Eldbus_Pending *p EINA_UNUSED)
{
Eldbus_Message *m2;
Eldbus_Message_Iter *iter;
- // brute force stop a previous verify - if its active - dont care about
reply
- m2 = eldbus_proxy_method_call_new(proxy_fprint_device, "VerifyStop");
- if (m2)
- {
-eldbus_proxy_send(proxy_fprint_device, m2, NULL, NULL, -1);
- }
+ printf("FP: verify stop...\n");
m2 = eldbus_proxy_method_call_new(proxy_fprint_device, "VerifyStart");
if (m2)
{
@@ -152,6 +148,19 @@ _verify_begin(void)
}
}
+static void
+_verify_begin(void)
+{
+ Eldbus_Message *m2;
+
+ printf("FP: verify begin...\n");
+ m2 = eldbus_proxy_method_call_new(proxy_fprint_device, "VerifyStop");
+ if (m2)
+ {
+eldbus_proxy_send(proxy_fprint_device, m2, _cb_verify_stop, NULL, -1);
+ }
+}
+
static void
_cb_verify(void *data EINA_UNUSED, const Eldbus_Message *m)
{
@@ -163,7 +172,7 @@ _cb_verify(void *data EINA_UNUSED, const Eldbus_Message *m)
printf("FP: verify ...\n");
if (eldbus_message_error_get(m, , ))
{
-fprintf(stderr, "Fprint err: %s %s\n", name, text);
+fprintf(stderr, "FP: Fprint err: %s %s\n", name, text);
return;
}
if (!eldbus_message_arguments_get(m, "sb", , )) return;
@@ -208,7 +217,7 @@ _cb_list_enrolled_fingers(void *data EINA_UNUSED, const
Eldbus_Message *m,
printf("FP: list fingers...\n");
if (eldbus_message_error_get(m, , ))
{
-fprintf(stderr, "Fprint err: %s %s\n", name, text);
+fprintf(stderr, "FP: Fprint err: %s %s\n", name, text);
return;
}
printf("FP: list fingers...\n");
@@ -250,7 +259,7 @@ _cb_claim(void *data EINA_UNUSED, const Eldbus_Message *m
EINA_UNUSED,
printf("FP: claim\n");
if (eldbus_message_error_get(m, , ))
{
-fprintf(stderr, "Fprint err: %s %s\n", name, text);
+fprintf(stderr, "FP: Fprint err: %s %s\n", name, text);
return;
}
// ListEnrolledFingrs '$USER' -> "as"
@@ -313,7 +322,7 @@ _cb_get_default_device(void *data EINA_UNUSED, const
Eldbus_Message *m,
printf("FP: get default device...\n");
if (eldbus_message_error_get(m, , ))
{
-fprintf(stderr, "Fprint err: %s %s\n", name, text);
+fprintf(stderr, "FP: Fprint err: %s %s\n", name, text);
return;
}
if (!eldbus_message_arguments_get(m, "o", )) return;
--
[EGIT] [core/enlightenment] master 01/01: auth and desklock - support auth by fingerprint and show status
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=1cf55952084b6b47c1a2bda2a3791614965f52f8
commit 1cf55952084b6b47c1a2bda2a3791614965f52f8
Author: Carsten Haitzler
Date: Fri Jul 2 13:26:05 2021 +0100
auth and desklock - support auth by fingerprint and show status
---
src/bin/e_auth.c| 339
src/bin/e_auth.h| 38 +
src/bin/e_main.c| 5 +
src/bin/e_utils.c | 9 ++
src/bin/e_utils.h | 2 +
src/modules/lokker/lokker.c | 64 +
6 files changed, 457 insertions(+)
diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c
index 0ab534511..e18a868f4 100644
--- a/src/bin/e_auth.c
+++ b/src/bin/e_auth.c
@@ -1,5 +1,32 @@
#include "e.h"
+E_API int E_EVENT_AUTH_FPRINT_AVAILABLE = 0;
+E_API int E_EVENT_AUTH_FPRINT_STATUS = 0;
+
+static Eldbus_Connection *conn = NULL;
+
+/
+
+EINTERN int
+e_auth_init(void)
+{
+ E_EVENT_AUTH_FPRINT_AVAILABLE = ecore_event_type_new();
+ E_EVENT_AUTH_FPRINT_STATUS = ecore_event_type_new();
+
+ conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
+ return 1;
+}
+
+EINTERN int
+e_auth_shutdown(void)
+{
+ if (conn) eldbus_connection_unref(conn);
+ conn = NULL;
+ return 1;
+}
+
+/
+
E_API int
e_auth_begin(char *passwd)
{
@@ -72,3 +99,315 @@ out:
e_util_memclear(buf, buflen);
return ret;
}
+
+/
+
+static Eldbus_Object *obj_fprint = NULL;
+static Eldbus_Proxy *proxy_fprint = NULL;
+
+static Eldbus_Object *obj_fprint_device = NULL;
+static Eldbus_Proxy *proxy_fprint_device = NULL;
+static E_Auth_Fprint_Type finger_type = E_AUTH_FPRINT_TYPE_UNKNOWN;
+static const char *finger_name = NULL;
+static const char *user_name = NULL;
+
+static void
+_cb_event_free(void *data EINA_UNUSED, void *event)
+{
+ free(event);
+}
+
+static void
+_cb_verify_start(void *data EINA_UNUSED, const Eldbus_Message *m,
+ Eldbus_Pending *p EINA_UNUSED)
+{
+ const char *name = NULL, *text = NULL;
+
+ printf("FP: verify start...\n");
+ if (eldbus_message_error_get(m, , ))
+ {
+fprintf(stderr, "Fprint err: %s %s\n", name, text);
+return;
+ }
+}
+
+static void
+_verify_begin(void)
+{
+ Eldbus_Message *m2;
+ Eldbus_Message_Iter *iter;
+
+ // brute force stop a previous verify - if its active - dont care about
reply
+ m2 = eldbus_proxy_method_call_new(proxy_fprint_device, "VerifyStop");
+ if (m2)
+ {
+eldbus_proxy_send(proxy_fprint_device, m2, NULL, NULL, -1);
+ }
+ m2 = eldbus_proxy_method_call_new(proxy_fprint_device, "VerifyStart");
+ if (m2)
+ {
+iter = eldbus_message_iter_get(m2);
+eldbus_message_iter_basic_append(iter, 's', finger_name);
+eldbus_proxy_send(proxy_fprint_device, m2, _cb_verify_start, NULL, -1);
+ }
+}
+
+static void
+_cb_verify(void *data EINA_UNUSED, const Eldbus_Message *m)
+{
+ Eina_Bool val = EINA_FALSE;
+ const char *txt = NULL;
+ const char *name = NULL, *text = NULL;
+ E_Event_Auth_Fprint_Status *ev;
+
+ printf("FP: verify ...\n");
+ if (eldbus_message_error_get(m, , ))
+ {
+fprintf(stderr, "Fprint err: %s %s\n", name, text);
+return;
+ }
+ if (!eldbus_message_arguments_get(m, "sb", , )) return;
+ printf("FP: verify = [%s] %i\n", txt, val);
+ if (!txt) return;
+
+ ev = calloc(1, sizeof(E_Event_Auth_Fprint_Status));
+ if (!ev) return;
+
+ if (!strcmp(txt, "verify-match")) ev->status =
E_AUTH_FPRINT_STATUS_AUTH;
+ else if (!strcmp(txt, "verify-no-match")) ev->status =
E_AUTH_FPRINT_STATUS_NO_AUTH;
+ else if (!strcmp(txt, "verify-swipe-too-short")) ev->status =
E_AUTH_FPRINT_STATUS_SHORT_SWIPE;
+ else if (!strcmp(txt, "verify-finger-not-centered")) ev->status =
E_AUTH_FPRINT_STATUS_NO_CENTER;
+ else if (!strcmp(txt, "verify-remove-and-retry")) ev->status =
E_AUTH_FPRINT_STATUS_REMOVE_RETRY;
+ else if (!strcmp(txt, "verify-retry-scan")) ev->status =
E_AUTH_FPRINT_STATUS_RETRY;
+ else if (!strcmp(txt, "verify-disconnected")) ev->status =
E_AUTH_FPRINT_STATUS_DISCONNECT;
+ else if (!strcmp(txt, "verify-unknown-error")) ev->status =
E_AUTH_FPRINT_STATUS_ERROR;
+ else ev->status = E_AUTH_FPRINT_STATUS_ERROR;
+ ecore_event_add(E_EVENT_AUTH_FPRINT_STATUS, ev, _cb_event_free, NULL);
+ // reset the verify and try again if verify end and NOT an auth ok
+ if ((val) && // end of verify
+ (ev->status != E_AUTH_FPRINT_STATUS_AUTH))
+ {
+_verify_begin();
+ }
+ if (ev-&
[EGIT] [core/efl] master 01/01: elm theme - support fingerprint status in desklock
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a651cbe1a7430f049107cccae9d9e8c2a3cce034
commit a651cbe1a7430f049107cccae9d9e8c2a3cce034
Author: Carsten Haitzler
Date: Fri Jul 2 13:25:42 2021 +0100
elm theme - support fingerprint status in desklock
---
data/elementary/themes/colorclasses.edc | 4 ++
data/elementary/themes/edc/desklock.edc | 105 +++-
2 files changed, 107 insertions(+), 2 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 87cf853c5b..82c3374c0d 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -279,6 +279,10 @@ color_classes {
color: 255 255 255 255; }
color_class { name: "/fg/normal/desklock/selection";
color: 51 153 255 255; }
+ color_class { name: "/fg/normal/desklock/fprint/success";
+ color: 153 255 51 255; }
+ color_class { name: "/fg/normal/desklock/fprint/fail";
+ color: 255 153 51 255; }
///
color_class { name: "/bg/normal/hoversel/button";
color: 96 96 96 255; }
diff --git a/data/elementary/themes/edc/desklock.edc
b/data/elementary/themes/edc/desklock.edc
index 54cf04f277..b0e40b9449 100644
--- a/data/elementary/themes/edc/desklock.edc
+++ b/data/elementary/themes/edc/desklock.edc
@@ -174,11 +174,43 @@ group { name: "e/desklock/login_box";
visible: 1;
}
}
+ part { name: "fprint";
+ scale: 1;
+ description { state: "default" 0.0;
+image.normal: "i-fingerprint";
+min: 40 40;
+max: 40 40;
+rel.to_x: "clipper";
+rel.to_y: "e.text.password";
+rel1.relative: 0.0 1.0;
+align: 0.5 0.0;
+color: 255 255 255 0; // no cc
+color_class: "/fg/normal/desklock/fprint/normal";
+visible: 0;
+ }
+ description { state: "active" 0.0;
+inherit: "default" 0.0;
+color: 255 255 255 255; // no cc
+visible: 1;
+ }
+ description { state: "auth-success" 0.0;
+inherit: "default" 0.0;
+color_class: "/fg/normal/desklock/fprint/success";
+color: 255 255 255 255; // no cc
+visible: 1;
+ }
+ description { state: "auth-fail" 0.0;
+inherit: "default" 0.0;
+color_class: "/fg/normal/desklock/fprint/fail";
+color: 255 255 255 255; // no cc
+visible: 1;
+ }
+ }
part { name: "busy_area"; type: SPACER;
scale: 1;
description { state: "default" 0.0;
-min: 20 20;
-max: 160 160;
+min: 40 40;
+max: 40 40;
rel.to: "clipper";
rel1.relative: 0.0 0.5;
align: 0.5 0.0;
@@ -225,6 +257,75 @@ group { name: "e/desklock/login_box";
action: STATE_SET "default" 0.0;
target: "logo_clip";
}
+
+ program { signal: "e,fprint,unknown"; source: "e";
+ action: STATE_SET "active" 0.0;
+ transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
+ target: "fprint";
+ }
+ program { signal: "e,fprint,press"; source: "e";
+ action: STATE_SET "active" 0.0;
+ transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
+ target: "fprint";
+ }
+ program { signal: "e,fprint,swipe"; source: "e";
+ action: STATE_SET "active" 0.0;
+ transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
+ target: "fprint";
+ }
+
+ program { signal: "e,fprint,auth,success"; source: "e";
+ action: STATE_SET "auth-success" 0.0;
+ transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
+ target: "fprint";
+ }
+ program { signal: "e,fprint,auth,fail"; source: "e";
+ action: STATE_SET "auth-fail" 0.0;
+ transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
+ target: "fprint";
+ after: "fprint-reset";
+ }
+ program { signal: "e,fprint,auth,short"; source: "e";
+ action: STATE_SET "auth-fail" 0.0;
+ transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
+ target: "fprint";
+ after: "fprint-reset";
+ }
+ program { signal: "e,fprint,auth,nocenter"; source: "
[EGIT] [core/enlightenment] master 01/01: polkit- use nicerr icon when not told which icon to display
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=bf440924921ef3fe5c5cc78d09361a6a1bde8610
commit bf440924921ef3fe5c5cc78d09361a6a1bde8610
Author: Carsten Haitzler
Date: Thu Jul 1 16:48:15 2021 +0100
polkit- use nicerr icon when not told which icon to display
use lock icon.
---
src/modules/polkit/auth_ui.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/modules/polkit/auth_ui.c b/src/modules/polkit/auth_ui.c
index e45d50b71..cacfa8afc 100644
--- a/src/modules/polkit/auth_ui.c
+++ b/src/modules/polkit/auth_ui.c
@@ -97,9 +97,9 @@ auth_ui(Polkit_Session *ps)
win = dia->win;
if ((!ps->icon_name) || (!ps->icon_name[0]))
- e_dialog_icon_set(dia, "enlightenment", 64);
+ e_dialog_icon_set(dia, "lock", 40);
else
- e_dialog_icon_set(dia, ps->icon_name, 64);
+ e_dialog_icon_set(dia, ps->icon_name, 40);
evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cb_del, NULL);
elm_win_autodel_set(win, EINA_TRUE);
@@ -147,7 +147,7 @@ auth_ui(Polkit_Session *ps)
if ((pass) && (pass->pw_name))
snprintf(buf, sizeof(buf), _("Enter password for %s"),
pass->pw_name);
else
- snprintf(buf, sizeof(buf), _("Enter passowrd for UID %u"),
ps->target_uid);
+ snprintf(buf, sizeof(buf), _("Enter password for UID %u"),
ps->target_uid);
lab2 = o = elm_label_add(win);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0);
--
[EGIT] [core/efl] master 01/01: elm theme - add lock and unlock e icons
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=19779640729679ad3fdf4efe99fca3354e59f4b3
commit 19779640729679ad3fdf4efe99fca3354e59f4b3
Author: Carsten Haitzler
Date: Thu Jul 1 16:47:54 2021 +0100
elm theme - add lock and unlock e icons
---
data/elementary/themes/edc/icons.edc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/data/elementary/themes/edc/icons.edc
b/data/elementary/themes/edc/icons.edc
index a239354185..52ee2c4778 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -146,6 +146,9 @@ ICON("enlightenment/wallpaper_pan", "i-fill-pan")
ICON("battery", "i-battery")
ICON("gadgets", "i-gadgets")
+
+ICON("lock", "i-padlock-lock")
+ICON("unlock", "i-padlock-unlock")
#undef ICON
// mono color default fg color icons
--
[EGIT] [core/efl] master 01/01: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8f0ba01374fd38d289ac4c3d1b6df00b0898660a
commit 8f0ba01374fd38d289ac4c3d1b6df00b0898660a
Author: Carsten Haitzler
Date: Wed Jun 30 18:02:04 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc| 3 ++
data/elementary/themes/edc/randr.edc | 54 +
data/elementary/themes/edc/scrollframe.edc | 65 +++---
3 files changed, 54 insertions(+), 68 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 0c957b23df..87cf853c5b 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -61,6 +61,9 @@ color_classes {
color: 51 153 255 255; }
color_class { name: "/fg/normal/pointer/manipulator";
color: 51 153 255 192; }
+///
+ color_class { name: "/fg/normal/scroller/bar";
+ color: 51 153 255 255; }
///
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
diff --git a/data/elementary/themes/edc/randr.edc
b/data/elementary/themes/edc/randr.edc
index 55f348712b..73da9978d2 100644
--- a/data/elementary/themes/edc/randr.edc
+++ b/data/elementary/themes/edc/randr.edc
@@ -6,7 +6,7 @@ group { name: "e/conf/randr/main";
description { state: "default" 0.0;
rel1.offset: 2 2;
rel2.offset: -3 -3;
-color: DARK_GREY_BG_COLOR;
+color_class: "/bg-dark/normal";
min: 18 18;
offscale;
}
@@ -19,7 +19,7 @@ group { name: "e/conf/randr/main";
rel1.offset: 2 2;
rel2.offset: -3 -3;
image.normal: "diagonal_stripes.png";
- color: 255 255 255 64;
+ color_class: "/bg-dark-alt/normal";
TILED_PATTERN(240, 240)
offscale;
}
@@ -83,7 +83,7 @@ group { name: "e/conf/randr/main/frame";
part { name: "primary"; type: RECT;
scale: 1;
description { state: "default" 0.0;
-color: 48 48 48 255;
+color_class: "/bg-alt/normal";
rel1.offset: -4 -4;
rel2.offset: 3 3;
offscale;
@@ -109,7 +109,7 @@ group { name: "e/conf/randr/main/frame";
}
description { state: "off" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 16;
+color: 255 255 255 16; // no cc
}
}
part { name: "e.box.clone"; type: BOX;
@@ -141,7 +141,8 @@ group { name: "e/conf/randr/main/frame";
}
description { state: "active" 0.0;
inherit: "default" 0.0;
-color: 51 153 255 128;
+color_class: "/bg/selected";
+color: 255 255 255 128; // no cc
visible: 1;
}
}
@@ -156,7 +157,7 @@ group { name: "e/conf/randr/main/frame";
min: 12 12;
max: 12 12;
image.normal: "i-radio";
-color: 32 32 32 255;
+color_class: "/bg-dark/normal";
offscale;
fixed: 1 1;
}
@@ -168,11 +169,12 @@ group { name: "e/conf/randr/main/frame";
min: 10 10;
max: 10 10;
image.normal: "i-radio";
+color_class: "/fg/normal";
fixed: 1 1;
}
description { state: "pulse" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 128;
+color: 255 255 255 128; // no cc
}
description { state: "off" 0.0;
inherit: "default" 0.0;
@@ -242,7 +244,7 @@ group { name: "e/conf/randr/main/frame";
FIXED_SIZE(15, 15)
image.normal: "i-arrow-u";
fixed: 1 1;
-color: 51 153 255 255;
+color_class: "/fg-alt/selected";
offscale;
}
}
@@ -256,7 +258,7 @@ group { name: "e/conf/randr/main/frame";
FIXED_SIZE(20, 20)
image.normal: "i-system-shutdown";
fixed: 1 1;
-color: 51 153 255 255;
+color_class: "/fg-alt/selected";
}
}
part { name: "rsz1"; mouse_events: 0;
@@ -268,13 +270,13 @@ group { name: "e/conf/randr/main/frame";
rel.to: "e.event.resize";
image.normal: "i-arrow-lu"
[EGIT] [core/efl] master 01/01: elm theme - fix old e raidos ...
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b703469f767eae06c567bfded2df282b55dbd78e
commit b703469f767eae06c567bfded2df282b55dbd78e
Author: Carsten Haitzler
Date: Tue Jun 29 20:01:23 2021 +0100
elm theme - fix old e raidos ...
---
data/elementary/themes/edc/radio.edc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/elementary/themes/edc/radio.edc
b/data/elementary/themes/edc/radio.edc
index f32207a273..04460c6818 100644
--- a/data/elementary/themes/edc/radio.edc
+++ b/data/elementary/themes/edc/radio.edc
@@ -31,13 +31,13 @@ group { name: "e/widgets/radio";
clip_to: "clip";
description { state: "default" 0.0;
rel.to: "base";
-image.normal: "radio.png";
+image.normal: "i-radio";
color_class: "/fg/normal/radio/radio";
visible: 0;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
-color_class: "/fg/pressed/radio/radio";
+color_class: "/fg/normal/radio/radio";
visible: 1;
}
description { state: "pressed" 0.0;
--
[EGIT] [core/efl] master 02/03: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c8947b5778d2daf9970514f07f7d2589b7825e1f
commit c8947b5778d2daf9970514f07f7d2589b7825e1f
Author: Carsten Haitzler
Date: Tue Jun 29 18:42:19 2021 +0100
elm theme - more cc work
---
data/elementary/themes/edc/pager.edc | 44 +++---
data/elementary/themes/edc/pager16.edc | 42
2 files changed, 57 insertions(+), 29 deletions(-)
diff --git a/data/elementary/themes/edc/pager.edc
b/data/elementary/themes/edc/pager.edc
index 086153c862..8926a27e4b 100644
--- a/data/elementary/themes/edc/pager.edc
+++ b/data/elementary/themes/edc/pager.edc
@@ -2,7 +2,7 @@ group { name: "e/modules/pager/popup";
parts {
part { name: "base"; type: RECT;
description { state: "default" 0.0;
-color: 64 64 64 255;
+color_class: "/bg/normal/popup/pager";
}
}
part { name: "e.swallow.content"; type: SWALLOW;
@@ -24,7 +24,7 @@ group { name: "e/modules/pager/popup";
rel2.relative: 1.0 0.0;
rel2.offset: -9 8;
align: 0.5 0.0;
-color: 160 160 160 255;
+color_class: "/fg/normal/popup/pager/text/title";
text { font: FNBD; size: 10;
text_class: "title_bar";
align: 0.5 0.0;
@@ -75,8 +75,8 @@ group { name: "e/modules/pager/desk";
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
desc { "default";
rel.to: "e.swallow.content";
-color: FN_COL_DEFAULT;
-text { font: "Sans"; size: 10;
+color_class: "/fg/normal/gadgets/pager/desk/text";
+text { font: FN; size: 10;
text_class: "module_small";
align: 0.5 0.5;
}
@@ -90,7 +90,7 @@ group { name: "e/modules/pager/desk";
scale: 1;
clip_to: "clip";
desc { "default";
-color: 51 153 255 255;
+color_class: "/bg/selected/gadgets/pager/desk";
visible: 0;
rel.to: "e.swallow.content";
rel1.relative: 0.0 1.0;
@@ -104,6 +104,7 @@ group { name: "e/modules/pager/desk";
}
}
part { name: "drop0"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
image.normal: "mini_blue_glow_arrow_0.png";
rel.to: "base";
@@ -115,6 +116,8 @@ group { name: "e/modules/pager/desk";
min: 10 10;
fixed: 1 1;
visible: 0;
+offscale;
+color_class: "/fg/selected/gadgets/pager/desk/drop/arrows";
}
description { state: "active" 0.0;
inherit: "default" 0.0;
@@ -125,10 +128,11 @@ group { name: "e/modules/pager/desk";
rel1.offset: 11 11;
rel2.offset: 11 11;
min: 1 1;
-color: 255 255 255 0;
+color: 255 255 255 0; // no cc
}
}
part { name: "drop1"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
image.normal: "mini_blue_glow_arrow_1.png";
rel.to: "base";
@@ -140,6 +144,8 @@ group { name: "e/modules/pager/desk";
min: 10 10;
fixed: 1 1;
visible: 0;
+offscale;
+color_class: "/fg/selected/gadgets/pager/desk/drop/arrows";
}
description { state: "active" 0.0;
inherit: "default" 0.0;
@@ -150,10 +156,11 @@ group { name: "e/modules/pager/desk";
rel1.offset: -12 11;
rel2.offset: -12 11;
min: 1 1;
-color: 255 255 255 0;
+color: 255 255 255 0; // no cc
}
}
part { name: "drop2"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
image.normal: "mini_blue_glow_arrow_2.png";
rel.to: "base";
@@ -165,6 +172,8 @@ group { name: "e/modules/pager/desk";
min: 10 10;
fixed: 1 1;
visible: 0;
+offscale;
+color_class: "/fg/selected/gadgets/pager/desk/drop/arrows";
}
description { state: "active" 0.0;
inherit: "default" 0.0;
@@ -175,10 +184,11 @@ group { name: "e/modules/pager/desk";
rel1.offset: -12 -12;
rel2.offset: -12 -12;
min: 1 1;
-color: 255 255 255
[EGIT] [core/efl] master 03/03: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=90f32f77ff38226c133b3a999b505654141f6b27
commit 90f32f77ff38226c133b3a999b505654141f6b27
Author: Carsten Haitzler
Date: Tue Jun 29 19:55:55 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 16
data/elementary/themes/edc/pointer.edc | 21 +++--
data/elementary/themes/edc/preview.edc | 8 +++-
data/elementary/themes/edc/radio.edc| 21 +++--
4 files changed, 41 insertions(+), 25 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 5e08474e2b..0c957b23df 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -54,6 +54,13 @@ color_classes {
color: 48 48 48 255; }
color_class { name: "/bg/normal/menu/item/radio/base";
color: 48 48 48 255; }
+///
+ color_class { name: "/fg/normal/pointer/base";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/pressed/pointer/base";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/pointer/manipulator";
+ color: 51 153 255 192; }
///
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
@@ -346,6 +353,15 @@ color_classes {
color: 56 56 56 255; }
color_class { name: "/fg/selected/check/check";
color: 160 160 160 255; }
+///
+ color_class { name: "/bg/normal/radio/base";
+ color: 48 48 48 255; }
+ color_class { name: "/bg/pressed/radio/base";
+ color: 32 32 32 255; }
+ color_class { name: "/bg/disabled/radio/base";
+ color: 56 56 56 255; }
+ color_class { name: "/fg/selected/radio/radio";
+ color: 160 160 160 255; }
///
color_class { name: "/bg/normal/toggle/base";
color: 48 48 48 255; }
diff --git a/data/elementary/themes/edc/pointer.edc
b/data/elementary/themes/edc/pointer.edc
index b425c6bb24..3adf45455f 100644
--- a/data/elementary/themes/edc/pointer.edc
+++ b/data/elementary/themes/edc/pointer.edc
@@ -5,14 +5,14 @@ group { name: "e/pointer/enlightenment/default/color";
part { name: "parent"; type: RECT;
scale: 1;
description { state: "default" 0.0;
-color: 255 255 255 255;
+color: 255 255 255 255; // no cc
FIXED_SIZE(32, 32)
}
description { state: "suspend" 0.0;
inherit: "default" 0.0;
rel1.relative: 0.5 0.5;
rel2.relative: 0.5 0.5;
-color: 255 255 255 0;
+color: 255 255 255 0; // no cc
}
}
part { name: "base";
@@ -20,10 +20,11 @@ group { name: "e/pointer/enlightenment/default/color";
description { state: "default" 0.0;
image.normal: "pointer.png";
rel.to: "parent";
+color_class: "/fg/normal/pointer/base";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
-color: 51 153 255 255;
+color_class: "/fg/pressed/pointer/base";
}
}
part { name: "e.swallow.hotspot"; type: SWALLOW;
@@ -121,10 +122,9 @@ group { name: "e/pointer/enlightenment/default/mono";
part { name: "e.swallow.hotspot"; type: SWALLOW;
description { state: "default" 0.0;
fixed: 1 1;
+rel.to: "base";
rel1.offset: 6 8;
-rel1.to: "base";
rel2.offset: 6 8;
-rel2.to: "base";
rel2.relative: 0.0 0.0;
}
}
@@ -137,7 +137,7 @@ group { name: "e/pointer/enlightenment/resize_br/color";
part { name: "box"; type: RECT;
insert_after: "base";
description { state: "default" 0.0;
-color: 51 153 255 192;
+color_class: "/fg/normal/pointer/manipulator";
rel1.relative: 0.3 0.3;
rel2.relative: 0.7 0.7;
}
@@ -283,7 +283,7 @@ group { name: "e/pointer/enlightenment/hand/color";
part { name: "box"; type: RECT;
insert_after: "base";
description { state: "default" 0.0;
-color: 51 153 255 192;
+color_class: "/fg/normal/pointe
[EGIT] [core/efl] master 01/03: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=62000272b2c82497b8cefb6ba88edbd1dba084d8
commit 62000272b2c82497b8cefb6ba88edbd1dba084d8
Author: Carsten Haitzler
Date: Tue Jun 29 18:20:02 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 47 +++---
data/elementary/themes/edc/packagekit.edc| 59 ++---
data/elementary/themes/img/pkg-base-040.png | Bin 0 -> 192 bytes
data/elementary/themes/img/pkg-base-080.png | Bin 0 -> 294 bytes
data/elementary/themes/img/pkg-base-160.png | Bin 0 -> 500 bytes
data/elementary/themes/img/pkg-label-040.png | Bin 0 -> 210 bytes
data/elementary/themes/img/pkg-label-080.png | Bin 0 -> 277 bytes
data/elementary/themes/img/pkg-label-160.png | Bin 0 -> 464 bytes
data/elementary/themes/img/pkg-shade-040.png | Bin 0 -> 554 bytes
data/elementary/themes/img/pkg-shade-080.png | Bin 0 -> 1090 bytes
data/elementary/themes/img/pkg-shade-160.png | Bin 0 -> 2196 bytes
data/elementary/themes/img/svg/package.svg | 125 +++
12 files changed, 129 insertions(+), 102 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 5d416cad3a..5e08474e2b 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -367,6 +367,25 @@ color_classes {
color: 96 96 96 255; }
color_class { name: "/bg/pressed/scroller/bar";
color: 255 255 255 255; }
+///
+ color_class { name: "/bg/normal/notification";
+ color: 0 0 0 200; }
+ color_class { name: "/fg/normal/notification/button/close";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/pressed/notification/button/close";
+ color: 200 200 200 255; }
+ color_class { name: "/fg/normal/notification/logo";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/notification/text/title";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/notification/text";
+ color: 160 160 160 255; }
+ color_class { name: "/fg/normal/notification/text/subject";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/notification/text/bold";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/notification/text/underline";
+ color: 51 153 255 255; }
///
color_class { name: "/bg/normal/shelf/translucent";
color: 64 64 64 128; }
@@ -505,24 +524,24 @@ color_classes {
color_class { name: "/fg/normal/gadgets/music_control/text/tag";
color: 51 153 255 255; }
///
- color_class { name: "/bg/normal/notification";
- color: 0 0 0 200; }
- color_class { name: "/fg/normal/notification/button/close";
+ color_class { name: "/fg/normal/gadgets/packagekit/label";
color: 255 255 255 255; }
- color_class { name: "/fg/pressed/notification/button/close";
- color: 200 200 200 255; }
- color_class { name: "/fg/normal/notification/logo";
+ color_class { name: "/fg/normal/gadgets/packagekit/text";
color: 255 255 255 255; }
- color_class { name: "/fg/normal/notification/text/title";
+ color_class { name: "/fg/normal/gadgets/packagekit/status";
color: 255 255 255 255; }
- color_class { name: "/fg/normal/notification/text";
- color: 160 160 160 255; }
- color_class { name: "/fg/normal/notification/text/subject";
- color: 51 153 255 255; }
- color_class { name: "/fg/normal/notification/text/bold";
+ color_class { name: "/fg/normal/gadgets/packagekit/pkg/bug";
+ color: 255 153 51 255; }
+ color_class { name: "/fg/normal/gadgets/packagekit/pkg/enhancement";
+ color: 255 153 51 255; }
+ color_class { name: "/fg/normal/gadgets/packagekit/pkg/important";
+ color: 255 51 153 255; }
+ color_class { name: "/fg/normal/gadgets/packagekit/pkg/low-priority";
+ color: 255 255 255 128; }
+ color_class { name: "/fg/normal/gadgets/packagekit/pkg/normal";
color: 255 255 255 255; }
- color_class { name: "/fg/normal/notification/text/underline";
- color: 51 153 255 255; }
+ color_class { name: "/fg/normal/gadgets/packagekit/pkg/security";
+ color: 255 153 51 255; }
diff --git a/data/elementary/themes/edc/packagekit.edc
b/data/elementary/themes/edc/packagekit.edc
index 672327b88b..76c366c02d 100644
--- a/data/elementary/themes/edc/packagekit.edc
+++ b/data/elementary/
[EGIT] [core/efl] master 01/02: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=59b4732444235d9932daff368ca90a958a1a80ec
commit 59b4732444235d9932daff368ca90a958a1a80ec
Author: Carsten Haitzler
Date: Mon Jun 28 17:32:39 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 9 +++
data/elementary/themes/edc/menu.edc | 5 --
data/elementary/themes/edc/mixer.edc| 49 +++---
data/elementary/themes/img/speaker-clip-040.png | Bin 0 -> 858 bytes
data/elementary/themes/img/speaker-clip-080.png | Bin 0 -> 1751 bytes
data/elementary/themes/img/speaker-clip-160.png | Bin 0 -> 3853 bytes
data/elementary/themes/img/svg/speaker2.svg | 82
7 files changed, 118 insertions(+), 27 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 63f51f98af..701049c236 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -478,6 +478,15 @@ color_classes {
color: 255 51 153 255; }
color_class { name: "/fg/normal/gadgets/cpufreq/hands/average";
color: 255 153 51 255; }
+///
+ color_class { name: "/bg/normal/gadgets/mixer/base";
+ color: 32 32 32 255; }
+ color_class { name: "/bg/normal/gadgets/mixer/middle";
+ color: 48 48 48 255; }
+ color_class { name: "/fg/normal/gadgets/mixer/volume/normal";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/gadgets/mixer/volume/mute";
+ color: 255 153 51 255; }
diff --git a/data/elementary/themes/edc/menu.edc
b/data/elementary/themes/edc/menu.edc
index 62fb43b1bb..343eead955 100644
--- a/data/elementary/themes/edc/menu.edc
+++ b/data/elementary/themes/edc/menu.edc
@@ -158,11 +158,6 @@ group { name: "e/widgets/menu/default/icon";
group { name: "e/widgets/menu/default/label";
parts {
-// part { name: "base"; type: RECT;
-// description { state: "default";
-//color: 0 0 0 0; // no cc
-// }
-// }
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
diff --git a/data/elementary/themes/edc/mixer.edc
b/data/elementary/themes/edc/mixer.edc
index 1a2251bf6f..cc701afa44 100644
--- a/data/elementary/themes/edc/mixer.edc
+++ b/data/elementary/themes/edc/mixer.edc
@@ -1,7 +1,9 @@
group { name: "e/modules/mixer/main";
- images.image: "speaker.png" COMP;
- images.image: "speaker_clip.png" COMP;
- images.image: "speaker_vol.png" COMP;
+ set { name: "speaker_clip";
+ image { image: "speaker-clip-160.png" COMP; size: 81 81 9 9; }
+ image { image: "speaker-clip-080.png" COMP; size: 41 41 80 80 9; }
+ image { image: "speaker-clip-040.png" COMP; size: 0 0 40 40; }
+ }
max: 160 160;
min: 16 16;
script {
@@ -42,19 +44,27 @@ group { name: "e/modules/mixer/main";
parts {
part { name: "base";
description { state: "default" 0.0;
-rel1.relative: (25/380) (25/380);
-rel2.relative: (365/380) (365/380);
+image.normal: "clock_base";
aspect: 1.0 1.0; aspect_preference: BOTH;
-image.normal: "speaker.png";
+color_class: "/bg/normal/gadgets/mixer/base";
+ }
+ }
+ part { name: "middle";
+ description { state: "default" 0.0;
+rel.to: "base";
+rel1.relative: 0.3 0.3;
+rel2.relative: 0.7 0.7;
+image.normal: "clock_base";
+color_class: "/bg/normal/gadgets/mixer/middle";
}
}
part { name: "state"; type: RECT;
description { state: "default" 0.0;
-color: 51 153 255 255;
+color_class: "/fg/normal/gadgets/mixer/volume/normal";
}
description { state: "mute" 0.0;
inherit: "default" 0.0;
-color: 255 153 51 255;
+color_class: "/fg/normal/gadgets/mixer/volume/mute";
}
}
part { name: "state-l"; type: RECT;
@@ -74,39 +84,34 @@ group { name: "e/modules/mixer/main";
part { name: "vclip-l";
clip_to: "state-l";
description { state: "default" 0.0;
-rel1.to: "base";
-rel2.to: "base";
-image.normal: "speaker_clip.png";
+rel.to: "base";
+image.normal: "s
[EGIT] [core/efl] master 02/02: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5f2cd0e875906aff24f4c7c112fd26e1896d6b54
commit 5f2cd0e875906aff24f4c7c112fd26e1896d6b54
Author: Carsten Haitzler
Date: Mon Jun 28 18:49:14 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 36 +++
data/elementary/themes/edc/dialog.edc| 2 +-
data/elementary/themes/edc/edgebindings.edc | 2 +-
data/elementary/themes/edc/elm/entry.edc | 30 -
data/elementary/themes/edc/entry.edc | 4 +-
data/elementary/themes/edc/evrything.edc | 6 +-
data/elementary/themes/edc/fileman.edc | 4 +-
data/elementary/themes/edc/music_control.edc | 56
data/elementary/themes/edc/notification.edc | 97 +++-
9 files changed, 129 insertions(+), 108 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 701049c236..5d416cad3a 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -487,6 +487,42 @@ color_classes {
color: 51 153 255 255; }
color_class { name: "/fg/normal/gadgets/mixer/volume/mute";
color: 255 153 51 255; }
+///
+ color_class { name: "/bg/normal/gadgets/music_control/base";
+ color: 0 0 0 128; }
+ color_class { name: "/bg/pressed/gadgets/music_control/base";
+ color: 0 0 0 220; }
+ color_class { name: "/fg/pressed/gadgets/music_control/text";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/pressed/gadgets/music_control/button";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/pressed/gadgets/music_control/progress";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/gadgets/music_control/text";
+ color: 220 220 220 255; }
+ color_class { name: "/fg/normal/gadgets/music_control/text/title";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/gadgets/music_control/text/tag";
+ color: 51 153 255 255; }
+///
+ color_class { name: "/bg/normal/notification";
+ color: 0 0 0 200; }
+ color_class { name: "/fg/normal/notification/button/close";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/pressed/notification/button/close";
+ color: 200 200 200 255; }
+ color_class { name: "/fg/normal/notification/logo";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/notification/text/title";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/notification/text";
+ color: 160 160 160 255; }
+ color_class { name: "/fg/normal/notification/text/subject";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/notification/text/bold";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/notification/text/underline";
+ color: 51 153 255 255; }
diff --git a/data/elementary/themes/edc/dialog.edc
b/data/elementary/themes/edc/dialog.edc
index f8abde0c17..be44e7c73b 100644
--- a/data/elementary/themes/edc/dialog.edc
+++ b/data/elementary/themes/edc/dialog.edc
@@ -105,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_class=/fg/normal/text wrap=word";
+ base: "font="FN" font_size=10 text_class=tb_plain align=center
color=cc:/fg/normal/text wrap=word";
tag: "br" "\n";
tag: "hilight" "+ font="FNBD" text_class=tb_light";
}
diff --git a/data/elementary/themes/edc/edgebindings.edc
b/data/elementary/themes/edc/edgebindings.edc
index d71299030c..a668015049 100644
--- a/data/elementary/themes/edc/edgebindings.edc
+++ b/data/elementary/themes/edc/edgebindings.edc
@@ -5,7 +5,7 @@ group { name: "e/modules/conf_edgebindings/selection";
images.image: "mini_blue_glow_arrow_3.png" COMP;
styles {
style { name: "edge_binding_style";
- base: "font="FN" font_size=10 text_class=tb_plain align=center
color_class=/fg/normal/text wrap=word";
+ base: "font="FN" font_size=10 text_class=tb_plain align=center
color=cc:/fg/normal/text wrap=word";
tag: "br" "\n";
tag: "hilight" "+ font="FNBD" text_class=tb_light";
}
diff --git a/data/elementary/themes/edc/elm/entry.edc
b/data/elemen
[EGIT] [core/enlightenment] master 01/01: connman - warning remove after disabling econnman settings
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=fe32c5d6795c378dcc0efc0fe77636bd903cf328
commit fe32c5d6795c378dcc0efc0fe77636bd903cf328
Author: Carsten Haitzler
Date: Mon Jun 28 00:15:04 2021 +0100
connman - warning remove after disabling econnman settings
---
src/modules/connman/e_mod_main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c
index 8600c1dd1..67c0a339c 100644
--- a/src/modules/connman/e_mod_main.c
+++ b/src/modules/connman/e_mod_main.c
@@ -412,6 +412,7 @@ econnman_mod_manager_inout(struct Connman_Manager *cm)
econnman_mod_manager_update(cm);
}
+/*
static void
_econnman_menu_cb_configure(void *data, E_Menu *menu EINA_UNUSED,
E_Menu_Item *mi EINA_UNUSED)
@@ -419,12 +420,13 @@ _econnman_menu_cb_configure(void *data, E_Menu *menu
EINA_UNUSED,
E_Connman_Instance *inst = data;
_econnman_app_launch(inst);
}
+*/
static void
_econnman_menu_new(E_Connman_Instance *inst, Evas_Event_Mouse_Down *ev)
{
E_Menu *m;
- E_Menu_Item *mi;
+// E_Menu_Item *mi;
int x, y;
m = e_menu_new();
--
[EGIT] [core/efl] master 03/05: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=89993e39ff5c7e073e4498ed1283a5cb9b54d3f3
commit 89993e39ff5c7e073e4498ed1283a5cb9b54d3f3
Author: Carsten Haitzler
Date: Sun Jun 27 18:18:46 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 9 ++
data/elementary/themes/edc/ilist.edc| 57 -
data/elementary/themes/edc/init.edc | 31 +-
3 files changed, 46 insertions(+), 51 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 7ec512e475..a2103a7a71 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -48,6 +48,11 @@ color_classes {
///
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
+///
+ color_class { name: "/fg/normal/init/logo";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/init/text/version";
+ color: 80 80 80 255; }
///
color_class { name: "/fg/normal/fileman/icon/over";
color: 51 153 255 255; }
@@ -201,10 +206,14 @@ color_classes {
///
color_class { name: "/bg/normal/list/group";
color: 32 32 32 255; }
+ color_class { name: "/fg/normal/list/toggle";
+ color: 96 96 96 255; }
color_class { name: "/fg/normal/list/group";
color: 255 255 255 255; }
color_class { name: "/fg/disabled/list/group";
color: 80 80 80 255; }
+ color_class { name: "/fg/normal/list/typebuf/text";
+ color: 255 255 255 255; }
///
color_class { name: "/bg/normal/frame/title";
color: 80 80 80 255; }
diff --git a/data/elementary/themes/edc/ilist.edc
b/data/elementary/themes/edc/ilist.edc
index d07fbe4932..403b7a4696 100644
--- a/data/elementary/themes/edc/ilist.edc
+++ b/data/elementary/themes/edc/ilist.edc
@@ -3,22 +3,21 @@ group { name: "e/ilist";
part { name: "typebuf_clip"; type: RECT;
description { state: "default" 0.0;
visible: 0;
-color: 255 255 255 0;
+color: 255 255 255 0; // no cc
}
description { state: "active" 0.0;
visible: 1;
-color: 255 255 255 255;
+color: 255 255 255 255; // no cc
}
}
part { name: "base"; type: RECT; mouse_events: 0;
clip_to: "typebuf_clip";
scale: 1;
description { state: "default" 0.0;
+rel.to: "e.text.label";
rel1.offset: -8 -8;
-rel1.to: "e.text.label";
rel2.offset: 7 7;
-rel2.to: "e.text.label";
-color: 0 0 0 192;
+color_class: "/dim/normal/list/typebuf/base";
offscale;
}
}
@@ -30,7 +29,7 @@ group { name: "e/ilist";
rel1.offset: -8 -8;
rel2.relative: 0.5 0.5;
rel2.offset: 7 7;
-color: 255 255 255 255;
+color_class: "/fg/normal/list/typebuf/text";
text { font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
@@ -62,12 +61,12 @@ group { name: "e/widgets/ilist";
parts {
part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-color: 64 64 64 255;
+color_class: "/bg/normal/list/item";
}
}
part { name: "sel_base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-color: 51 153 255 255;
+color_class: "/bg/selected/list/item";
visible: 0;
}
description { state: "selected" 0.0;
@@ -99,7 +98,7 @@ group { name: "e/widgets/ilist";
rel2.offset: -5 -5;
rel2.relative: 0.0 1.0;
rel2.to_x: "e.swallow.end";
-color: 160 160 160 255;
+color_class: "/fg/normal/list/item";
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
@@ -110,11 +109,11 @@ group { name: "e/widgets/ilist";
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+
[EGIT] [core/efl] master 04/05: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e1a117e0d4975772139c2574c859b2168903ad36
commit e1a117e0d4975772139c2574c859b2168903ad36
Author: Carsten Haitzler
Date: Sun Jun 27 19:08:13 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 9
data/elementary/themes/edc/menu.edc | 40 +
2 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index a2103a7a71..63f51f98af 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -45,6 +45,15 @@ color_classes {
///
color_class { name: "/dim";
color: 0 0 0 200; }
+///
+ color_class { name: "/fg/normal/menu/title";
+ color: 255 255 255 255; }
+ color_class { name: "/bg/selected/menu/item/base";
+ color: 32 32 32 255; }
+ color_class { name: "/bg/normal/menu/item/check/base";
+ color: 48 48 48 255; }
+ color_class { name: "/bg/normal/menu/item/radio/base";
+ color: 48 48 48 255; }
///
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
diff --git a/data/elementary/themes/edc/menu.edc
b/data/elementary/themes/edc/menu.edc
index ed4613770c..2bb0e578f6 100644
--- a/data/elementary/themes/edc/menu.edc
+++ b/data/elementary/themes/edc/menu.edc
@@ -2,7 +2,7 @@ group { name: "e/widgets/menu/default/background";
parts {
part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-color: 64 64 64 255;
+color_class: "/bg/normal/menu/base";
}
}
part { name: "clip"; type: RECT; mouse_events: 0;
@@ -18,7 +18,7 @@ group { name: "e/widgets/menu/default/background";
rel2.relative: 1.0 0.0;
rel2.offset: -2 -1;
align: 0.5 0.0;
-color: 255 255 255 255;
+color_class: "/fg/normal/menu/title";
max: 0 0;
text { font: FNBD; size: 10;
text_class: "menu_title";
@@ -40,8 +40,10 @@ group { name: "e/widgets/menu/default/background";
}
part { name: "e.swallow.content"; type: SWALLOW;
clip_to: "clip";
+ scale: 1;
description { state: "default" 0.0;
rel1.to_y: "base";
+offscale;
}
description { state: "active" 0.0;
inherit: "default" 0.0;
@@ -73,7 +75,7 @@ group { name: "e/widgets/menu/default/separator";
rel1.offset: 0 10;
rel2.offset: -1 -11;
min: 0 1;
-color: 72 72 72 255;
+color_class: "/fg/normal/separator/menu";
offscale;
}
}
@@ -85,7 +87,7 @@ group { name: "e/widgets/menu/default/item_bg";
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;
@@ -105,7 +107,7 @@ group { name: "e/widgets/menu/default/item_bg";
}
part { name: "events"; type: RECT;
description { state: "default";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
}
}
@@ -125,10 +127,10 @@ group { name: "e/widgets/menu/default/icon";
parts {
part { name: "clip"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-color: 255 255 255 255;
+color: 255 255 255 255; // no cc
}
description { state: "disabled" 0.0;
-color: 255 255 255 40;
+color: 255 255 255 64; // no cc
}
}
part { name: "e.swallow.content"; type: SWALLOW;
@@ -158,7 +160,7 @@ group { name: "e/widgets/menu/default/label";
parts {
part { name: "base"; type: RECT;
description { state: "default";
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
}
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
@@ -166,7 +168,7 @@ group { name: "e/widgets/menu/default/label";
description { state: "default" 0.0;
[EGIT] [core/efl] master 01/05: elm theme - more cc polishing
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0c67b70d15403e83730f83d53013e268de31e699
commit 0c67b70d15403e83730f83d53013e268de31e699
Author: Carsten Haitzler
Date: Sun Jun 27 10:13:51 2021 +0100
elm theme - more cc polishing
---
data/elementary/themes/colorclasses.edc | 2 --
data/elementary/themes/edc/fileman.edc | 28
2 files changed, 30 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index afd10347c6..e212dd7194 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -49,8 +49,6 @@ color_classes {
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
///
- color_class { name: "/bg-dark/normal/fileman/icon/base";
- color: 48 48 48 255; }
color_class { name: "/fg/normal/fileman/icon/over";
color: 51 153 255 255; }
color_class { name: "/fg/normal/fileman/mount/off";
diff --git a/data/elementary/themes/edc/fileman.edc
b/data/elementary/themes/edc/fileman.edc
index e88974b029..3a8118a374 100644
--- a/data/elementary/themes/edc/fileman.edc
+++ b/data/elementary/themes/edc/fileman.edc
@@ -77,18 +77,6 @@ group { name: "e/fileman/default/list/variable";
inherit: "default" 0.0;
}
}
- part { name: "icon_base"; type: RECT; mouse_events: 0;
- clip_to: "icon";
- description { state: "default" 0.0;
-color_class: "/bg-dark/normal/fileman/icon/base";
-rel.to: "e.swallow.icon";
-visible: 0;
- }
- description { state: "start" 0.0;
-inherit: "default" 0.0;
-visible: 1;
- }
- }
part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
clip_to: "icon";
description { state: "default" 0.0;
@@ -227,14 +215,12 @@ group { name: "e/fileman/default/list/variable";
program { signal: "e,action,thumb,gen"; source: "e";
action: STATE_SET "start" 0.0;
target: "icon";
- target: "icon_base";
target: "icon_over";
after: "gen";
}
program { signal: "e,action,thumb,gen,alpha"; source: "e";
action: STATE_SET "start" 0.0;
target: "icon";
- target: "icon_base";
target: "icon_over";
after: "gen";
}
@@ -392,18 +378,6 @@ group { name: "e/fileman/default/icon/fixed";
inherit: "default" 0.0;
}
}
- part { name: "icon_base"; type: RECT; mouse_events: 0;
- clip_to: "icon";
- description { state: "default" 0.0;
-color_class: "/bg-dark/normal/fileman/icon/base";
-rel.to: "e.swallow.icon";
-visible: 0;
- }
- description { state: "start" 0.0;
-inherit: "default" 0.0;
-visible: 1;
- }
- }
part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
clip_to: "icon";
description { state: "default" 0.0;
@@ -547,14 +521,12 @@ group { name: "e/fileman/default/icon/fixed";
program { signal: "e,action,thumb,gen"; source: "e";
action: STATE_SET "start" 0.0;
target: "icon";
- target: "icon_base";
target: "icon_over";
after: "gen";
}
program { signal: "e,action,thumb,gen,alpha"; source: "e";
action: STATE_SET "start" 0.0;
target: "icon";
- target: "icon_base";
target: "icon_over";
after: "gen";
}
--
[EGIT] [core/efl] master 05/05: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ffc6c33dd84b344f18fe00a835017a824499ed06
commit ffc6c33dd84b344f18fe00a835017a824499ed06
Author: Carsten Haitzler
Date: Sun Jun 27 19:09:12 2021 +0100
elm theme - more cc work
---
data/elementary/themes/edc/menu.edc | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/data/elementary/themes/edc/menu.edc
b/data/elementary/themes/edc/menu.edc
index 2bb0e578f6..62fb43b1bb 100644
--- a/data/elementary/themes/edc/menu.edc
+++ b/data/elementary/themes/edc/menu.edc
@@ -158,11 +158,11 @@ group { name: "e/widgets/menu/default/icon";
group { name: "e/widgets/menu/default/label";
parts {
- part { name: "base"; type: RECT;
- description { state: "default";
-color: 0 0 0 0; // no cc
- }
- }
+// part { name: "base"; type: RECT;
+// description { state: "default";
+//color: 0 0 0 0; // no cc
+// }
+// }
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
--
[EGIT] [core/efl] master 02/05: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=10282241f83aef45d97836b97efa3b1b0bc4f541
commit 10282241f83aef45d97836b97efa3b1b0bc4f541
Author: Carsten Haitzler
Date: Sun Jun 27 17:19:29 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 9 ++
data/elementary/themes/edc/ibar-ibox.edc | 148 ++-
2 files changed, 93 insertions(+), 64 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index e212dd7194..7ec512e475 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -355,6 +355,15 @@ color_classes {
///
color_class { name: "/fg/selected/edgebindings/edge";
color: 51 153 255 255; }
+///
+ color_class { name: "/fg/normal/gadgets/ibar/text/text";
+ color: 255 255 255 255; }
+ color_class { name: "/bg/normal/gadgets/ibar/drop/base";
+ color: 51 153 255 25; }
+ color_class { name: "/bg/normal/gadgets/ibar/drop/outline";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/gadgets/ibar/drop/arrow";
+ color: 51 153 255 255; }
///
color_class { name: "/fg/normal/gadgets/backlight/light/off";
color: 255 255 255 0; }
diff --git a/data/elementary/themes/edc/ibar-ibox.edc
b/data/elementary/themes/edc/ibar-ibox.edc
index 507cce76a3..233fce 100644
--- a/data/elementary/themes/edc/ibar-ibox.edc
+++ b/data/elementary/themes/edc/ibar-ibox.edc
@@ -1,12 +1,14 @@
group { name: "e/modules/ibar/separator/default";
parts {
part { name: "base"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
min: 1 1;
max: 1 9;
rel1.offset: 4 4;
rel2.offset: -5 -5;
-color: 80 80 80 255;
+color_class: "/fg/normal/gadgets/ibar/separator";
+offscale;
}
}
}
@@ -30,14 +32,16 @@ group { name: "e/modules/ibox/icon";
// data.item: "item_list" "item item2 item3";
parts {
part { name: "item_clip"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
-rel1.offset: -100 -100;
-rel2.offset: 99 99;
-color: 255 255 255 255;
+rel1.offset: -1000 -1000;
+rel2.offset: 999 999;
+color: 255 255 255 255; // no cc
+offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 64;
+color: 255 255 255 64; // no cc
}
}
part { name: "content"; type: SPACER;
@@ -151,7 +155,7 @@ group { name: "e/modules/ibox/icon";
scale: 1;
clip_to: "clip1";
description { state: "default";
-color: 51 153 255 255;
+color_class: "/bg/selected/gadgets/ibar/selection";
visible: 0;
rel1.relative: 0.0 1.0;
align: 0.5 1.0;
@@ -170,7 +174,7 @@ group { name: "e/modules/ibox/icon";
scale: 1;
clip_to: "clip2";
description { state: "default";
-color: 51 153 255 255;
+color_class: "/bg/selected/gadgets/ibar/selection";
visible: 0;
rel2.relative: 0.0 1.0;
align: 0.0 0.5;
@@ -189,7 +193,7 @@ group { name: "e/modules/ibox/icon";
scale: 1;
clip_to: "clip3";
description { state: "default";
-color: 51 153 255 255;
+color_class: "/bg/selected/gadgets/ibar/selection";
visible: 0;
rel1.relative: 1.0 0.0;
align: 1.0 0.5;
@@ -206,7 +210,7 @@ group { name: "e/modules/ibox/icon";
}
part { name: "over"; type: RECT;
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
}
}
@@ -314,20 +318,24 @@ group { name: "e/modules/ibox/icon_overlay";
}
parts {
part { name: "item_clip"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
-rel1.offset: -100 -100;
-rel2.offset: 99 99;
-color: 255 255 255 255;
+rel1.offset: -1000 -1000;
+rel2.offset: 999 999;
+color: 255 255 255 255; // no cc
+offs
[EGIT] [core/efl] master 01/01: elm theme - cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4ab074c4685e842dae4404fdbdb4fabef4e4b758
commit 4ab074c4685e842dae4404fdbdb4fabef4e4b758
Author: Carsten Haitzler
Date: Sun Jun 27 08:59:46 2021 +0100
elm theme - cc work
---
data/elementary/themes/colorclasses.edc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index e212dd7194..afd10347c6 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -49,6 +49,8 @@ color_classes {
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
///
+ color_class { name: "/bg-dark/normal/fileman/icon/base";
+ color: 48 48 48 255; }
color_class { name: "/fg/normal/fileman/icon/over";
color: 51 153 255 255; }
color_class { name: "/fg/normal/fileman/mount/off";
--
[EGIT] [core/efl] master 01/01: ecore evas - fix leake and possile seg i added in cnp paste fix
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=74da29321c800a1638103364077fe667aa2ddeed
commit 74da29321c800a1638103364077fe667aa2ddeed
Author: Carsten Haitzler
Date: Sat Jun 26 22:47:31 2021 +0100
ecore evas - fix leake and possile seg i added in cnp paste fix
previous commit fixed a bug but added this possible one. this fixes
that.
---
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 369c9cda5c..d3382686e3 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -3830,8 +3830,8 @@ _search_fitting_type(Ecore_Evas *ee,
Ecore_Evas_Engine_Data_X11 *edata, Ecore_Ev
}
eina_iterator_free(iter);
}
+ eina_stringshare_del(mime_type);
}
-eina_stringshare_del(mime_type);
}
if (found_conversion)
{
--
[EGIT] [core/enlightenment] master 01/01: coonman gadget - thats it - no more settings to run econnman
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=58f0c652dec35685434d203b7ca1d80b777e1031
commit 58f0c652dec35685434d203b7ca1d80b777e1031
Author: Carsten Haitzler
Date: Sat Jun 26 21:51:52 2021 +0100
coonman gadget - thats it - no more settings to run econnman
this just confuses people. disable.
---
src/modules/connman/e_mod_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c
index 67f294093..8600c1dd1 100644
--- a/src/modules/connman/e_mod_main.c
+++ b/src/modules/connman/e_mod_main.c
@@ -428,11 +428,12 @@ _econnman_menu_new(E_Connman_Instance *inst,
Evas_Event_Mouse_Down *ev)
int x, y;
m = e_menu_new();
+/*
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Settings"));
e_util_menu_item_theme_icon_set(mi, "configure");
e_menu_item_callback_set(mi, _econnman_menu_cb_configure, inst);
-
+ */
m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0);
e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, , , NULL, NULL);
e_menu_activate_mouse(m,
--
[EGIT] [core/efl] master 01/01: ecore evas - cnp - look for exact mime matches before conversions
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b8be1271716f85595d1ff12c5dd733601f9b
commit b8be1271716f85595d1ff12c5dd733601f9b
Author: Carsten Haitzler
Date: Sat Jun 26 21:40:10 2021 +0100
ecore evas - cnp - look for exact mime matches before conversions
fixes chrome -> efl copy and paste.
@fix
---
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 28 -
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index c75af6368f..369c9cda5c 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -3788,27 +3788,45 @@ _search_fitting_type(Ecore_Evas *ee,
Ecore_Evas_Engine_Data_X11 *edata, Ecore_Ev
EINA_SAFETY_ON_NULL_RETURN(edata->selection_data[selection].acceptable_type);
+ // first pass - try find an EXACT mime type match
for (unsigned int i = 0; i < eina_array_count(arr) && !found_conversion;
++i)
{
const char *x11_name = eina_array_data_get(arr, i);
+
mime_type = _decrypt_type(x11_name);
for (unsigned int j = 0; j <
eina_array_count(edata->selection_data[selection].acceptable_type) &&
!found_conversion; ++j)
{
- const char *acceptable_type = (const char*)
eina_array_data_get(edata->selection_data[selection].acceptable_type, j);
+ const char *acceptable_type = (const char
*)eina_array_data_get(edata->selection_data[selection].acceptable_type, j);
if (mime_type == acceptable_type)
- HANDLE_TYPE()
+ {
+ HANDLE_TYPE()
+ }
+ }
+eina_stringshare_del(mime_type);
+ }
+ // second pass - exact match not found - look for conversions instead
+ if (!found_conversion)
+ {
+for (unsigned int i = 0; i < eina_array_count(arr) &&
!found_conversion; ++i)
+ {
+ const char *x11_name = eina_array_data_get(arr, i);
+
+ mime_type = _decrypt_type(x11_name);
- //if there is no available type yet, check if we can convert to
the desired type via this type
- if (!found_conversion)
+ for (unsigned int j = 0; j <
eina_array_count(edata->selection_data[selection].acceptable_type) &&
!found_conversion; ++j)
{
+ const char *acceptable_type = (const char
*)eina_array_data_get(edata->selection_data[selection].acceptable_type, j);
const char *convertion_type = NULL;
+
Eina_Iterator *iter =
eina_content_converter_possible_conversions(mime_type);
EINA_ITERATOR_FOREACH(iter, convertion_type)
{
if (convertion_type == acceptable_type)
- HANDLE_TYPE()
+ {
+HANDLE_TYPE()
+ }
}
eina_iterator_free(iter);
}
--
[EGIT] [core/efl] master 02/02: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8e6376c035158786ae8847d372ffb3b6f061d58c
commit 8e6376c035158786ae8847d372ffb3b6f061d58c
Author: Carsten Haitzler (Rasterman)
Date: Sat Jun 26 01:05:28 2021 +0100
elm theme - more cc work
---
data/elementary/themes/edc/elm/frame.edc | 4 +--
data/elementary/themes/edc/fontpreview.edc | 2 +-
data/elementary/themes/edc/frame.edc | 44 --
3 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/data/elementary/themes/edc/elm/frame.edc
b/data/elementary/themes/edc/elm/frame.edc
index 1564f5b09b..66d3a79358 100644
--- a/data/elementary/themes/edc/elm/frame.edc
+++ b/data/elementary/themes/edc/elm/frame.edc
@@ -41,7 +41,6 @@ group { name: "elm/frame/base/default";
rel2.offset: -5 4;
align: 0.0 0.0;
color_class: "/fg/normal/frame/title";
-color: 255 255 255 255;
text { font: FNBD; size: 10;
align: 0.0 0.5;
min: 0 1;
@@ -62,8 +61,7 @@ group { name: "elm/frame/base/default";
}
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
-rel1.to: "bg";
-rel2.to: "bg";
+rel.to: "bg";
}
}
part { name: "elm.swallow.content"; type: SWALLOW;
diff --git a/data/elementary/themes/edc/fontpreview.edc
b/data/elementary/themes/edc/fontpreview.edc
index 8c407535e6..74dedf8eb5 100644
--- a/data/elementary/themes/edc/fontpreview.edc
+++ b/data/elementary/themes/edc/fontpreview.edc
@@ -3,7 +3,7 @@ group { name: "e/widgets/fontpreview";
part { name: "e.fontpreview.text"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
-color: FN_COL_DEFAULT;
+color_class: "/fg/normal/text/fontpreview";
rel1.offset: 4 4;
rel2.offset: -5 -5;
text { font: FN; size: 10;
diff --git a/data/elementary/themes/edc/frame.edc
b/data/elementary/themes/edc/frame.edc
index 4423ad51df..7ee29880a4 100644
--- a/data/elementary/themes/edc/frame.edc
+++ b/data/elementary/themes/edc/frame.edc
@@ -1,26 +1,27 @@
group { name: "e/widgets/frame";
- images.image: "win_shadow.png" COMP;
+ images.image: "win_shad_flat.png" COMP;
parts {
- part { name: "shadow"; mouse_events: 0;
- scale: 1;
+ part { name: "shadow"; type: RECT;
description { state: "default" 0.0;
-rel.to: "base";
-WIN_SHADOW_SMALL;
- }
- description { state: "hidden" 0.0;
-inherit;
-visible: 0;
+rel.to: "_sh1";
+color_class: "/shadow/normal/frame";
}
}
- part { name: "base"; type: RECT;
+ WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25);
+ part { name: "base"; type: SPACER;
scale: 1;
description { state: "default" 0.0;
rel1.offset: 6 6;
rel2.offset: -7 -7;
-color: 80 80 80 255;
offscale;
}
}
+ part { name: "top_bg"; type: RECT;
+ description { state: "default" 0.0;
+rel.to: "top";
+color_class: "/bg/normal/frame/title";
+ }
+ }
part { name: "top"; type: SPACER;
scale: 1;
description { state: "default" 0.0;
@@ -34,15 +35,14 @@ group { name: "e/widgets/frame";
part { name: "e.text.label"; type: TEXT;
scale: 1;
description { state: "default" 0.0;
+rel.to: "base";
rel1.offset: 4 4;
-rel1.to: "base";
rel2.relative: 1.0 0.0;
rel2.offset: -5 4;
-rel2.to: "base";
align: 0.0 0.0;
-color: 255 255 255 255;
+color_class: "/fg/normal/frame/title";
text { font: FNBD; size: 10;
- align: 0.0 0.0;
+ align: 0.0 0.5;
min: 0 1;
}
fixed: 0 1;
@@ -56,13 +56,12 @@ group { name: "e/widgets/frame";
rel1.to_y: "top";
rel1.relative: 0.0 1.0;
rel2.to: "base";
-color: 64 64 64 255;
+color_class: "/bg/normal/frame";
}
}
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
-rel1.to: "bg";
-rel2.to: "bg";
+
[EGIT] [core/efl] master 01/02: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=047a9a9589491c709715171405a3e9b6afd99d23
commit 047a9a9589491c709715171405a3e9b6afd99d23
Author: Carsten Haitzler (Rasterman)
Date: Sat Jun 26 00:54:52 2021 +0100
elm theme - more cc work
---
data/elementary/themes/edc/fileman.edc | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/data/elementary/themes/edc/fileman.edc
b/data/elementary/themes/edc/fileman.edc
index 26b3332d41..e88974b029 100644
--- a/data/elementary/themes/edc/fileman.edc
+++ b/data/elementary/themes/edc/fileman.edc
@@ -1396,7 +1396,7 @@ group { name: "e/fileman/default/progress";
rel1.relative: 1.0 0.0;
rel1.offset: -9 8;
rel2.offset: -9 -9;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
FIXED_SIZE(15, 15)
fixed: 1 1;
offscale;
@@ -1544,7 +1544,7 @@ group { name: "e/modules/efm_navigation/main";
rel2.relative: 0.0 1.0;
rel2.offset: 6 -1;
align: 0.0 0.5;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
aspect: 1.0 1.0; aspect_preference: VERTICAL;
fixed: 0 1;
}
@@ -1555,7 +1555,7 @@ group { name: "e/modules/efm_navigation/main";
rel1.relative: 1.0 0.0;
rel2.to: "back";
align: 0.0 0.5;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
aspect: 1.0 1.0; aspect_preference: VERTICAL;
fixed: 0 1;
}
@@ -1566,7 +1566,7 @@ group { name: "e/modules/efm_navigation/main";
rel1.relative: 1.0 0.0;
rel2.to: "forward";
align: 0.0 0.5;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
aspect: 1.0 1.0; aspect_preference: VERTICAL;
fixed: 0 1;
}
@@ -1576,7 +1576,7 @@ group { name: "e/modules/efm_navigation/main";
rel.to: "parent";
rel1.relative: 1.0 0.0;
align: 0.0 0.5;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
aspect: 1.0 1.0; aspect_preference: VERTICAL;
fixed: 0 1;
}
@@ -1586,7 +1586,7 @@ group { name: "e/modules/efm_navigation/main";
rel.to: "reload";
rel1.relative: 1.0 0.0;
align: 0.0 0.5;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
aspect: 1.0 1.0; aspect_preference: VERTICAL;
fixed: 0 1;
}
--
[EGIT] [core/enlightenment] master 01/01: mixer - use double progress bar for a decay "max vu" value
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=14a83251bf718c2e76ec4e525d6e18e59995f320
commit 14a83251bf718c2e76ec4e525d6e18e59995f320
Author: Carsten Haitzler (Rasterman)
Date: Thu Jun 24 15:54:29 2021 +0100
mixer - use double progress bar for a decay "max vu" value
---
src/modules/mixer/e_mod_main.c | 36
src/modules/mixer/emixer.c | 21 +++--
2 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index 7de9214e5..175722cb1 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -54,7 +54,9 @@ struct _Mon_Data
Emix_Source *source;
Evas_Object *vu;
Ecore_Animator *animator;
+ double last_time;
float samp_max;
+ float samp_max2;
int mon_skips;
int mon_update;
int mon_samps;
@@ -160,23 +162,35 @@ static Eina_Bool
_cb_emix_monitor_update(void *data)
{
Mon_Data *md = data;
+ double t = ecore_loop_time_get();
+ double td = t - md->last_time;
+
+ if (md->samp_max2 < md->samp_max) md->samp_max2 = md->samp_max;
+ else
+ {
+md->samp_max2 = md->samp_max2 * (1.0 - (0.5 * td));
+if (md->samp_max2 < 0.001) md->samp_max2 = 0.0;
+ }
if (md->mon_update == 0)
{
md->mon_skips++;
if (md->mon_skips > 5)
{
- elm_progressbar_value_set(md->vu, 0.0);
+ elm_progressbar_part_value_set(md->vu, "elm.cur.progressbar",
0.0);
+ elm_progressbar_part_value_set(md->vu, "elm.cur.progressbar1",
0.0);
md->animator = NULL;
return EINA_FALSE;
}
return EINA_TRUE;
}
- elm_progressbar_value_set(md->vu, md->samp_max);
+ elm_progressbar_part_value_set(md->vu, "elm.cur.progressbar", md->samp_max);
+ elm_progressbar_part_value_set(md->vu, "elm.cur.progressbar1",
md->samp_max2);
md->mon_update = 0;
md->samp_max = 0;
md->mon_skips = 0;
md->mon_samps = 0;
+ md->last_time = t;
return EINA_TRUE;
}
@@ -209,23 +223,35 @@ static Eina_Bool
_cb_emix_source_monitor_update(void *data)
{
Mon_Data *md = data;
+ double t = ecore_loop_time_get();
+ double td = t - md->last_time;
+
+ if (md->samp_max2 < md->samp_max) md->samp_max2 = md->samp_max;
+ else
+ {
+md->samp_max2 = md->samp_max2 * (1.0 - (0.5 * td));
+if (md->samp_max2 < 0.001) md->samp_max2 = 0.0;
+ }
if (md->mon_update == 0)
{
md->mon_skips++;
if (md->mon_skips > 5)
{
- elm_progressbar_value_set(md->vu, 0.0);
+ elm_progressbar_part_value_set(md->vu, "elm.cur.progressbar",
0.0);
+ elm_progressbar_part_value_set(md->vu, "elm.cur.progressbar1",
0.0);
md->animator = NULL;
return EINA_FALSE;
}
return EINA_TRUE;
}
- elm_progressbar_value_set(md->vu, md->samp_max);
+ elm_progressbar_part_value_set(md->vu, "elm.cur.progressbar", md->samp_max);
+ elm_progressbar_part_value_set(md->vu, "elm.cur.progressbar1",
md->samp_max2);
md->mon_update = 0;
md->samp_max = 0;
md->mon_skips = 0;
md->mon_samps = 0;
+ md->last_time = t;
return EINA_TRUE;
}
@@ -685,6 +711,7 @@ _popup_recording_fill(Instance *inst)
evas_object_show(bx);
inst->recvu = elm_progressbar_add(e_comp->elm);
+elm_object_style_set(inst->recvu, "double");
elm_progressbar_unit_format_function_set(inst->recvu,
_cb_vu_format_cb, NULL);
evas_object_size_hint_weight_set(inst->recvu, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(inst->recvu, EVAS_HINT_FILL, 0.5);
@@ -779,6 +806,7 @@ _popup_new(Instance *inst)
evas_object_show(bx);
inst->vu = elm_progressbar_add(e_comp->elm);
+ elm_object_style_set(inst->vu, "double");
elm_progressbar_unit_format_function_set(inst->vu, _cb_vu_format_cb, NULL);
evas_object_size_hint_weight_set(inst->vu, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(inst->vu, EVAS_HINT_FILL, 0.5);
diff --git a/src/modules/mixer/emixer.c b/src/modules/mixer/emixer.c
index ab9266d6a..b47759980 100644
--- a/src/modules/mixer/emixer.c
+++ b/src/modules/mixer/emixer.c
@@ -98,7 +98,9 @@ typedef struct _Mon_Data
Evas_Object *fr;
Evas_Object *vu;
Ecore_Animator *animator;
+ double last_time;
float samp_max;
+ float samp_max2;
int mon_skips;
int mon_update;
int mon_samps;
@@ -110,23 +112,35 @@ static Eina_Bool
_cb_emix_monitor_update(void *data)
{
Mon_D
[EGIT] [core/efl] master 01/01: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d7e64acc216e29c1e610c63bded09a5b29d73a53
commit d7e64acc216e29c1e610c63bded09a5b29d73a53
Author: Carsten Haitzler (Rasterman)
Date: Mon Jun 21 23:07:52 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 43 +++
data/elementary/themes/edc/fileman.edc | 211
2 files changed, 151 insertions(+), 103 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index f53e159e01..e212dd7194 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -48,6 +48,49 @@ color_classes {
///
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
+///
+ color_class { name: "/fg/normal/fileman/icon/over";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/fileman/mount/off";
+ color: 255 255 255 128; }
+ color_class { name: "/fg/normal/fileman/mount/on";
+ color: 255 153 51 255; }
+ color_class { name: "/fg/normal/fileman/operation";
+ color: 255 255 255 255; }
+ color_class { name: "/bg/normal/fileman/desk/base";
+ color: 0 0 0 128; }
+ color_class { name: "/bg/selected/fileman/desk/base";
+ color: 0 0 0 200; }
+ color_class { name: "/bg/normal/fileman/overlay/busy/base";
+ color: 0 0 0 200; }
+ color_class { name: "/fg/normal/fileman/overlay/busy/text";
+ color: 255 255 255 255; }
+ color_class { name: "/bg/normal/fileman/overlay/typebuf/base";
+ color: 0 0 0 200; }
+ color_class { name: "/fg/normal/fileman/overlay/typebuf/text";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/fileman/drop/arrows";
+ color: 255 255 255 255; }
+ color_class { name: "/bg/normal/fileman/drop/base";
+ color: 51 153 255 25; }
+ color_class { name: "/bg/normal/fileman/drop/outline";
+ color: 51 153 255 255; }
+ color_class { name: "/bg/normal/fileman/selection/base";
+ color: 51 153 255 25; }
+ color_class { name: "/bg/normal/fileman/selection/outline";
+ color: 51 153 255 255; }
+ color_class { name: "/bg/normal/fileman/overlay/progress/base";
+ color: 0 0 0 200; }
+ color_class { name: "/fg/normal/fileman/overlay/progress/bar";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/fileman/overlay/progress/text";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/fileman/overlay/progress/led";
+ color: 255 153 51 255; }
+ color_class { name: "/fg/normal/fileman/overlay/progress/close";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/pressed/fileman/overlay/progress/close";
+ color: 200 200 200 255; }
///
color_class { name: "/bg/normal/titlebar";
color: 64 64 64 255; }
diff --git a/data/elementary/themes/edc/fileman.edc
b/data/elementary/themes/edc/fileman.edc
index 0061302c1c..26b3332d41 100644
--- a/data/elementary/themes/edc/fileman.edc
+++ b/data/elementary/themes/edc/fileman.edc
@@ -13,12 +13,12 @@ group { name: "e/fileman/default/list/variable";
parts {
part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-color: 64 64 64 255;
+color_class: "/bg/normal/list/item";
}
}
part { name: "sel_base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-color: 51 153 255 255;
+color_class: "/bg/selected/list/item";
visible: 0;
}
description { state: "selected" 0.0;
@@ -34,7 +34,7 @@ group { name: "e/fileman/default/list/variable";
rel1.to_x: "icon0";
rel2.offset: -5 -5;
rel2.relative: 1.0 1.0;
-color: 160 160 160 255;
+color_class: "/fg/normal/list/item";
text { font: FN; size: 10;
min: 0 1;
align: 0.0 0.5;
@@ -45,19 +45,20 @@ group { name: "e/fileman/default/list/variable";
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color_class: "/fg/selected/list/item";
}
description { state: "disabled" 0.0
[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=c491066178b55a993f6f0430be1c69e443f8fd6e
commit c491066178b55a993f6f0430be1c69e443f8fd6e
Author: Carsten Haitzler (Rasterman)
Date: Sun Jun 20 12:29:55 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 12 +
data/elementary/themes/edc/evrything.edc | 426 ---
2 files changed, 180 insertions(+), 258 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index a70a936be1..f53e159e01 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -111,6 +111,8 @@ color_classes {
color: 51 153 255 255; }
color_class { name: "/fg/disabled/text/hilight";
color: 25 76 128 255; }
+ color_class { name: "/fg/disabled/text-urgent";
+ color: 255 51 51 255; }
///
color_class { name: "/bg/normal/button";
color: 96 96 96 255; }
@@ -294,6 +296,16 @@ color_classes {
color: 51 153 255 255; }
color_class { name: "/fg/normal/toggle/button";
color: 51 153 255 255; }
+///
+ color_class { name: "/fg/normal/everything/entry/cursor";
+ color: 255 255 255 255; }
+///
+ color_class { name: "/bg/normal/scroller/bar";
+ color: 51 153 255 255; }
+ color_class { name: "/bg/disabled/scroller/bar";
+ color: 96 96 96 255; }
+ color_class { name: "/bg/pressed/scroller/bar";
+ color: 255 255 255 255; }
///
color_class { name: "/bg/normal/shelf/translucent";
color: 64 64 64 128; }
diff --git a/data/elementary/themes/edc/evrything.edc
b/data/elementary/themes/edc/evrything.edc
index 69c5ace6c6..a90ac5 100644
--- a/data/elementary/themes/edc/evrything.edc
+++ b/data/elementary/themes/edc/evrything.edc
@@ -17,7 +17,7 @@ group { name: "e/modules/everything/main";
rel2.relative: 1.0 0.0;
align: 0.5 0.0;
fixed: 1 1;
-color: 64 64 64 255;
+color_class: "/bg/normal/everything/selector";
}
}
part { name: "clipper"; type: RECT;
@@ -71,16 +71,14 @@ group { name: "e/modules/everything/main";
}
}
programs {
- program {
- signal: "e,state,object_selector_hide"; source: "e";
+ program { signal: "e,state,object_selector_hide"; source: "e";
action: STATE_SET "default" 0.00;
transition: SINUSOIDAL 0.15;
target: "object_selector";
target: "subject_selector";
target: "action_selector";
}
- program {
- signal: "e,state,object_selector_show"; source: "e";
+ program { signal: "e,state,object_selector_show"; source: "e";
action: STATE_SET "wide" 0.00;
transition: SINUSOIDAL 0.2;
target: "object_selector";
@@ -98,7 +96,7 @@ group { name: "e/modules/everything/selector_item";
}
part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-color: 51 153 255 255;
+color_class: "/bg/selected/everything/selector/item";
visible: 0;
}
description { state: "selected" 0.0;
@@ -109,19 +107,18 @@ group { name: "e/modules/everything/selector_item";
part { name: "icon_clip"; type: RECT;
clip_to: "clip";
description { state: "default" 0.0;
-color: 255 255 255 255;
+color: 255 255 255 255; // no cc
}
description { state: "faded" 0.0;
-color: 255 255 255 64;
+color: 255 255 255 64; // no cc
}
}
part { name: "e.swallow.icons"; type: SWALLOW;
scale : 1;
clip_to: "icon_clip";
description { state: "default" 0.0;
-min: 48 48;
-max: 48 48;
-aspect: 1.0 1.0; aspect_preference: VERTICAL;
+min: 40 40;
+max: 40 40;
align: 0.0 0.5;
rel1.offset: 8 8;
rel2.offset: 8 -9;
@@ -132,9 +129,8 @@ group { name: "e/modules/everything/selector_item";
clip_to: "icon_clip";
description { state: "default" 0.0;
rel.to:
[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=7bce24743bcf04b63aaddde93ca59d205a6e1ddf
commit 7bce24743bcf04b63aaddde93ca59d205a6e1ddf
Author: Carsten Haitzler (Rasterman)
Date: Fri Jun 18 18:39:56 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 6 +-
data/elementary/themes/edc/elm/entry.edc | 20 +++-
data/elementary/themes/edc/entry.edc | 27 +++
3 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 3320bad093..a70a936be1 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -84,7 +84,9 @@ color_classes {
color: 255 32 16 80; }
color_class { name: "/bg/selected/entry/validate-pass";
color: 32 255 16 80; }
- color_class { name: "/fg/entry/anchor";
+ color_class { name: "/bg/normal/entry/selection";
+ color: 51 153 255 128; }
+ color_class { name: "/fg/normal/entry/anchor";
color: 51 153 255 255; }
color_class { name: "/fg/disabled/entry/text";
color: 112 112 112 255; }
@@ -92,6 +94,8 @@ color_classes {
color: 80 80 80 255; }
color_class { name: "/fg/normal/entry/handler/end";
color: 51 153 255 255; }
+ color_class { name: "/fg/normal/entry/cursor";
+ color: 255 255 255 255; }
///
color_class { name: "/fg/normal/text-heading";
color: 255 255 255 255; }
diff --git a/data/elementary/themes/edc/elm/entry.edc
b/data/elementary/themes/edc/elm/entry.edc
index 8fa68867e0..e6d5dcc22e 100644
--- a/data/elementary/themes/edc/elm/entry.edc
+++ b/data/elementary/themes/edc/elm/entry.edc
@@ -398,21 +398,15 @@ group { name: "elm/scroller/entry_single/default";
}
}
programs {
- program { name: "validation_fail";
- signal: "validation,default,fail";
- source: "elm";
+ program { signal: "validation,default,fail"; source: "elm";
action: STATE_SET "fail" 0.0;
target: "validation_glow";
}
- program { name: "validation_pass";
- signal: "validation,default,pass";
- source: "elm";
+ program { signal: "validation,default,pass"; source: "elm";
action: STATE_SET "pass" 0.0;
target: "validation_glow";
}
- program { name: "validation_off";
- signal: "validation,default";
- source: "elm";
+ program { signal: "validation,default"; source: "elm";
action: STATE_SET "default" 0.0;
target: "validation_glow";
}
@@ -427,6 +421,7 @@ group { name: "elm/entry/cursor/default";
clip_to: "clipper";
description { state: "default" 0.0;
min: 1 10;
+color_class: "/fg/normal/entry/cursor";
visible: 0;
}
description { state: "visible" 0.0;
@@ -436,8 +431,7 @@ group { name: "elm/entry/cursor/default";
}
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
-rel1.to: "cursor";
-rel2.to: "cursor";
+rel.to: "cursor";
fixed: 1 1;
}
description { state: "hidden" 0.0;
@@ -512,7 +506,7 @@ group { name: "elm/entry/selection/default";
parts {
part { name: "base"; type: RECT;
description { state: "default" 0.0;
-color: 51 153 255 128;
+color_class: "/bg/normal/entry/selection";
}
}
}
@@ -523,7 +517,7 @@ group { name: "elm/entry/anchor/default";
part { name: "bar"; type: RECT;
scale: 1;
description { state: "default" 0.0;
-color_class: "/fg/entry/anchor";
+color_class: "/fg/normal/entry/anchor";
fixed: 0 1;
rel1.relative: 0.0 1.0;
rel1.offset: -1 -1;
diff --git a/data/elementary/themes/edc/entry.edc
b/data/elementary/themes/edc/entry.edc
index a1741cd5fd..b0069fe258 100644
--- a/data/elementary/themes/edc/entry.edc
+++ b/data/elementary/themes/edc/entry.edc
@@ -2,21 +2,21 @@ group { name: "e/widgets/entry/scrollframe";
parts {
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
-color: DARK_GREY_BG_COLOR;
+color_cla
[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=fe52ef19af065b214a286a3ffb50d8f1f91f45ed
commit fe52ef19af065b214a286a3ffb50d8f1f91f45ed
Author: Carsten Haitzler (Rasterman)
Date: Fri Jun 18 18:24:04 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 3 ++
data/elementary/themes/edc/edgebindings.edc | 52 +++--
2 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 9480e00840..3320bad093 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -293,6 +293,9 @@ color_classes {
///
color_class { name: "/bg/normal/shelf/translucent";
color: 64 64 64 128; }
+///
+ color_class { name: "/fg/selected/edgebindings/edge";
+ color: 51 153 255 255; }
///
color_class { name: "/fg/normal/gadgets/backlight/light/off";
color: 255 255 255 0; }
diff --git a/data/elementary/themes/edc/edgebindings.edc
b/data/elementary/themes/edc/edgebindings.edc
index 62e453084b..d71299030c 100644
--- a/data/elementary/themes/edc/edgebindings.edc
+++ b/data/elementary/themes/edc/edgebindings.edc
@@ -5,7 +5,7 @@ group { name: "e/modules/conf_edgebindings/selection";
images.image: "mini_blue_glow_arrow_3.png" COMP;
styles {
style { name: "edge_binding_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=/fg/normal/text wrap=word";
tag: "br" "\n";
tag: "hilight" "+ font="FNBD" text_class=tb_light";
}
@@ -14,7 +14,7 @@ group { name: "e/modules/conf_edgebindings/selection";
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
rel.to: "e.swallow.background";
-color: DARK_GREY_BG_COLOR;
+color_class: "/bg-dark/normal/edgebindings";
}
}
part { name: "e.swallow.background"; type: SWALLOW;
@@ -33,94 +33,112 @@ group { name: "e/modules/conf_edgebindings/selection";
rel.to: "e.swallow.background";
rel1.relative: 0.5 0.5;
rel2.relative: 0.5 0.5;
-color: 255 255 255 255;
fixed: 1 1;
text { font: FNBD; size: 10;
text_class: "label";
min: 1 1;
ellipsis: -1;
}
+color_class: "/fg/normal/text-hilight";
+offscale;
}
}
part { name: "e.edge.left"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
rel.to: "e.swallow.background";
rel1.offset: 0 10;
rel2.offset: -1 -11;
align: 0.0 0.5;
max: 5 9;
-color: 51 153 255 255;
+color_class: "/fg/selected/edgebindings/edge";
+offscale;
}
}
part { name: "e.edge.right"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
rel.to: "e.swallow.background";
rel1.offset: 0 10;
rel2.offset: -1 -11;
align: 1.0 0.5;
max: 5 9;
-color: 51 153 255 255;
+color_class: "/fg/selected/edgebindings/edge";
+offscale;
}
}
part { name: "e.edge.top"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
rel.to: "e.swallow.background";
rel1.offset: 10 0;
rel2.offset: -11 -1;
align: 0.5 0.0;
max: 9 5;
-color: 51 153 255 255;
+color_class: "/fg/selected/edgebindings/edge";
+offscale;
}
}
part { name: "e.edge.bottom"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
rel.to: "e.swallow.background";
rel1.offset: 10 0;
rel2.offset: -11 -1;
align: 0.5 1.0;
max: 9 5;
-color: 51 153 255 255;
+color_class: "/fg/selected/edgebindings/edge";
+offscale;
}
}
part { name: "e.
[EGIT] [core/efl] master 02/03: elm theme - more cc
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=65a021dc6a7fbf8fc69d8d08962b7ccce66275bd
commit 65a021dc6a7fbf8fc69d8d08962b7ccce66275bd
Author: Carsten Haitzler (Rasterman)
Date: Thu Jun 17 21:08:22 2021 +0100
elm theme - more cc
---
data/elementary/themes/edc/deskmirror.edc | 124 +++---
1 file changed, 46 insertions(+), 78 deletions(-)
diff --git a/data/elementary/themes/edc/deskmirror.edc
b/data/elementary/themes/edc/deskmirror.edc
index 6b64c2374d..71a1abaa6d 100644
--- a/data/elementary/themes/edc/deskmirror.edc
+++ b/data/elementary/themes/edc/deskmirror.edc
@@ -59,7 +59,7 @@ group { name: "e/deskmirror/frame/default";
rel2.to: "bottom";
rel2.offset: 4 4;
fill.smooth: 0;
-color: 255 255 255 128;
+color_class: "/shadow/normal/border";
}
description { state: "off";
inherit: "default" 0.0;
@@ -87,27 +87,25 @@ group { name: "e/deskmirror/frame/default";
part { name: "top"; type: RECT;
description { state: "default" 0.0;
-rel1.to: "top_spacer";
-rel2.to: "top_spacer";
-color: 64 64 64 255;
+rel.to: "top_spacer";
+color_class: "/bg/normal/titlebar";
min: 0 1;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
-color: 32 32 32 255;
+color_class: "/bg/selected/titlebar";
}
}
part { name: "e.text.title"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
+rel.to: "spacer";
rel1.offset: 1 3;
-rel1.to: "spacer";
rel2.relative: 1.0 0.0;
rel2.offset: -2 3;
-rel2.to: "spacer";
align: 0.5 0.0;
-color: 160 160 160 255;
+color_class: "/fg/normal/titlebar";
text { font: FNBD; size: 10;
text_class: "title_bar";
align: 0.5 0.0;
@@ -118,15 +116,14 @@ group { name: "e/deskmirror/frame/default";
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color_class: "/fg/selected/titlebar";
}
}
part { name: "bottom"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
-rel1.to: "bottom_size";
-rel2.to: "bottom_size";
-color: 64 64 64 255;
+rel.to: "bottom_size";
+color_class: "/bg/normal/border";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -138,16 +135,15 @@ group { name: "e/deskmirror/frame/default";
part { name: "clone"; type: PROXY; mouse_events: 0;
description { state: "default";
source: "e.swallow.client";
-rel1.to: "e.swallow.client";
-rel2.to: "e.swallow.client";
+rel.to: "e.swallow.client";
visible: 0;
-color: 255 255 255 0;
+color: 255 255 255 0; // no cc
proxy.source_clip: 0;
}
description { state: "urgent1";
inherit: "default" 0.0;
visible: 1;
-color: 255 255 255 255;
+color: 255 255 255 255; // no cc
proxy.source_clip: 0;
}
description { state: "urgent2" 0.0;
@@ -155,14 +151,13 @@ group { name: "e/deskmirror/frame/default";
visible: 1;
rel1.relative: -2.0 -2.0;
rel2.relative: 3.0 3.0;
-color: 255 255 255 0;
+color: 255 255 255 0; // no cc
proxy.source_clip: 0;
}
}
}
programs {
- program { name: "urgent";
- signal: "e,state,urgent"; source: "e";
+ program { signal: "e,state,urgent"; source: "e";
action: ACTION_STOP;
target: "go_big";
target: "go_big2";
@@ -179,8 +174,7 @@ group { name: "e/deskmirror/frame/default";
target: "clone";
after: "go_big";
}
- program { name: "not_urgent";
- signal: "e,state,not_urgent"; source: "e";
+ program { signal: "e,state,not_urgent"; source: "e";
action: ACTION_STOP
[EGIT] [core/efl] master 03/03: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7a26c093090262311f1adbe3fd8806a5912fb558
commit 7a26c093090262311f1adbe3fd8806a5912fb558
Author: Carsten Haitzler (Rasterman)
Date: Thu Jun 17 21:09:30 2021 +0100
elm theme - more cc work
---
data/elementary/themes/edc/deskpreview.edc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/elementary/themes/edc/deskpreview.edc
b/data/elementary/themes/edc/deskpreview.edc
index 0206ba40c2..2cb17570ae 100644
--- a/data/elementary/themes/edc/deskpreview.edc
+++ b/data/elementary/themes/edc/deskpreview.edc
@@ -4,7 +4,7 @@ group { name: "e/widgets/deskpreview/desk";
part { name: "e.event.menu"; type: RECT;
insert_after: "e.swallow.content";
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 0 0 0 0; // no cc
}
}
}
--
