kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm theme - notification break and feat add - needed 

this is bad but it's necessary. need to make the htextblock accept
events so links can be put in it. this then also requires it become
editable to support anchors and items which are needed for
notification links and inline images.

since this has to break nayway, embrace the break and add action box
swallow - and action buttons. the action buttons will probably need a
swallow added for icons still - but debating that still.

@fix / break / feat
This commit is contained in:
Carsten Haitzler 2022-06-18 00:40:48 +01:00
parent 919e646ad3
commit b3eac8b838
2 changed files with 118 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/elementary/themes/colorclasses.edc
View File

@ -172,6 +172,7 @@ color_tree {
"/fg/normal/spinner/arrow";
"/fg/normal/spinner/text";
"/fg/normal/notification/text";
"/fg/pressed/notification/text/title";
"/fg/selected/winlist/item/text/iconified";
"/fg/pressed/gadgets/tasks/text/iconified";
"/fg/normal/gadgets/battery/level/discharge";

141
data/elementary/themes/edc/notification.edc
View File

@ -33,8 +33,7 @@ group { name: "e/modules/notification/main";
tag: "b" "+ font="FNBD" text_class=module_bold color=cc:/fg/normal/notification/text/bold";
tag: "i" "+ font="FNIT" text_class=module_italic";
tag: "u" "+ underline=on underline_color=cc:/fg/normal/notification/text/underline";
tag: "img" ""; // images not supported
tag: "a" ""; // links not supported
tag: "link" "+ color=cc:/fg/normal/text-link underline=on underline_color=cc:/fg/normal/text-link";
}
}
@ -72,10 +71,10 @@ group { name: "e/modules/notification/main";
scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
aspect: 1.0 1.0;
aspect_preference: BOTH;
aspect: 1.0 1.0; aspect_preference: BOTH;
rel.to: "base";
rel1.offset: 12 12;
rel1.to_y: "notification.textblock.message";
rel1.offset: 12 0;
rel2.offset: 12 -13;
rel2.relative: 0.0 1.0;
min: 24 24;
@ -83,26 +82,11 @@ group { name: "e/modules/notification/main";
offscale;
}
}
part { name: "notification.textblock.message"; type: TEXTBLOCK; mouse_events: 0;
clip_to: "bodyclip";
scale: 1;
description { state: "default" 0.0;
align: 0.0 0.0;
rel.to: "base";
rel1.to_x: "notification.swallow.app_icon";
rel1.to_y: "notification.text.title";
rel1.relative: 1.0 1.0;
rel1.offset: 4 4;
rel2.offset: -27 -13;
text { style: "notification_style";
min: 0 1;
}
fixed: 1 1;
offscale;
}
}
part { name: "message"; type: TEXTBLOCK; mouse_events: 0;
scale: 1;
entry_mode: EDITABLE;
select_mode: EXPLICIT;
multiline: 1;
description { state: "default" 0.0;
align: 0.0 0.0;
min: 200 20;
@ -112,7 +96,9 @@ group { name: "e/modules/notification/main";
rel1.to_y: "notification.text.title";
rel1.relative: 1.0 1.0;
rel1.offset: 4 4;
rel2.offset: -27 -13;
rel2.offset: -27 -5;
rel2.to_y: "notification.swallow.actions";
rel2.relative: 1.0 0.0;
text { style: "notification_style";
text_source: "notification.textblock.message";
min: 0 1;
@ -121,6 +107,45 @@ group { name: "e/modules/notification/main";
offscale;
}
}
part { name: "notification.textblock.message"; type: TEXTBLOCK;
clip_to: "bodyclip";
scale: 1;
entry_mode: EDITABLE;
select_mode: EXPLICIT;
multiline: 1;
description { state: "default" 0.0;
align: 0.0 0.0;
rel.to: "base";
rel1.to_x: "notification.swallow.app_icon";
rel1.to_y: "notification.text.title";
rel1.relative: 1.0 1.0;
rel1.offset: 4 4;
rel2.offset: -27 -5;
rel2.to_y: "notification.swallow.actions";
rel2.relative: 1.0 0.0;
text { style: "notification_style";
min: 0 1;
}
fixed: 1 1;
offscale;
}
}
part { name: "notification.swallow.desktop_icon"; type: SWALLOW; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
align: 0.0 0.0;
aspect: 1.0 1.0; aspect_preference: BOTH;
rel1.to_x: "base";
rel1.to_y: "notification.text.title";
rel1.offset: 12 0;
rel2.to: "notification.text.title";
rel2.offset: 12 -1;
rel2.relative: 0.0 1.0;
min: 15 15;
fixed: 1 1;
offscale;
}
}
part { name: "notification.text.title"; type: TEXT; mouse_events: 0;
clip_to: "titleclip";
scale: 1;
@ -144,6 +169,24 @@ group { name: "e/modules/notification/main";
}
}
part { name: "notification.swallow.actions"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
align: 0.5 1.0;
rel.to: "base";
rel1.relative: 0.0 1.0;
rel1.offset: 12 -13;
rel2.offset: -13 -13;
offscale;
visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
min: 40 20;
}
}
part { name: "close";
scale: 1;
description { state: "default" 0.0;
@ -190,6 +233,14 @@ group { name: "e/modules/notification/main";
program { signal: "mouse,clicked,1"; source: "base";
action: SIGNAL_EMIT "notification,find" "theme";
}
program { signal: "e,state,actions,show"; source: "e";
action: STATE_SET "visible" 0.0;
target: "notification.swallow.actions";
}
program { signal: "e,state,actions,hide"; source: "e";
action: STATE_SET "default" 0.0;
target: "notification.swallow.actions";
}
// program {
// signal: "notification,new"; source: "notification";
// }
@ -201,3 +252,45 @@ group { name: "e/modules/notification/main";
// }
}
}
group { name: "e/modules/notification/action";
parts {
part { name: "e.text.label"; type: TEXT;
scale: 1;
description { state: "default" 0.0;
rel1.offset: 4 4;
rel2.offset: -5 -5;
color_class: "/fg/normal/notification/text/title";
text { font: FNBD; size: 10;
min: 1 1;
text_class: "notification_title";
}
offscale;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
color_class: "/fg/pressed/notification/text/title";
}
}
part { name: "event"; type: RECT;
scale : 1;
description { state: "default" 0.0;
color: 0 0 0 0; // no cc
min: 40 20;
}
}
}
programs {
program { signal: "mouse,down,1"; source: "event";
action: STATE_SET "selected" 0.0;
target: "e.text.label";
}
program { signal: "mouse,up,1"; source: "event";
action: STATE_SET "default" 0.0;
target: "e.text.label";
}
program { signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "e,action,clicked" "e";
}
}
}