[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/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 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;
rel1.offset: 4 -1;
rel2.offset: -5 -1;
-color: 160 160 160 255;
+color_class: "/fg/normal/menu/item/text";
min: 0 16;
text { font: FN; size: 10;
min: 1 1;
@@ -178,11 +180,11 @@ group { name: "e/widgets/menu/default/label";
}
description { state: "selected" 0.0;
inherit: "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
+offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 64;
+color: 255 255 255 64; // no cc
}
}
part { name: "base"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
rel1.offset: 3 4;
[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;
+color_class: "/fg/selected/list/item";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
-color: 80 80 80 255;
+color_class: "/fg/disabled/list/item";
}
}
part { name: "e.swallow.end"; type: SWALLOW; mouse_events: 0;
@@ -139,26 +138,22 @@ group { name: "e/widgets/ilist";
}
[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 01/01: exactness: Make sure image valid before usage....
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=868a5c28ff73adcdd913bc58c44cb558ebd1f974
commit 868a5c28ff73adcdd913bc58c44cb558ebd1f974
Author: Christopher Michael
Date: Mon Jun 28 00:14:49 2021 -0400
exactness: Make sure image valid before usage
dh
---
src/bin/exactness/player.c | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/bin/exactness/player.c b/src/bin/exactness/player.c
index ed493a521d..66506ba729 100644
--- a/src/bin/exactness/player.c
+++ b/src/bin/exactness/player.c
@@ -206,9 +206,13 @@ _shot_do(Evas *e)
else if (_dest_type == FTYPE_EXU)
{
Exactness_Image *ex_img = malloc(sizeof(*ex_img));
- _dest_unit->imgs = eina_list_append(_dest_unit->imgs, ex_img);
- _dest_unit->nb_shots++;
- e_data = ex_img;
+
+ if (ex_img)
+ {
+ _dest_unit->imgs = eina_list_append(_dest_unit->imgs,
ex_img);
+ _dest_unit->nb_shots++;
+ e_data = ex_img;
+ }
}
else if (_dest_type == FTYPE_REMOTE)
{
--
