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

TH - fix content sizing min in icons with shared text def + fix btn

This commit is contained in:
Carsten Haitzler 2018-05-10 21:31:07 +09:00
parent 587679b92c
commit 8197c18ff8
9 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/elementary/themes/edc/elm/bubble.edc
View File

@ -43,7 +43,7 @@ group { name: "elm/bubble/top_left/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}
@ -192,7 +192,7 @@ group { name: "elm/bubble/top_right/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}
@ -339,7 +339,7 @@ group { name: "elm/bubble/bottom_left/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}
@ -488,7 +488,7 @@ group { name: "elm/bubble/bottom_right/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}

41
data/elementary/themes/edc/elm/button.edc
View File

@ -72,6 +72,7 @@ group { name: "elm/button/base/default";
text { "sizer.content"; nomouse;
scale: 1;
desc { "default";
fixed: 1 1;
visible: 0;
text { font: FN; size: 10;
min: 0 0;
@ -83,15 +84,16 @@ group { name: "elm/button/base/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
desc { "icononly"; inherit;
fixed: 0 0;
rel.to: "elm.swallow.content";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}
@ -371,30 +373,28 @@ group { name: "elm/button/base/anchor";
text { "sizer.content"; nomouse;
scale: 1;
desc { "default";
fixed: 1 1;
visible: 0;
text { font: FN; size: 10;
min: 0 0;
text_class: "button_text";
}
}
desc { "visible";
inherit: "default";
rel1.to: "elm.swallow.content";
rel2.to: "elm.swallow.content";
desc { "visible"; inherit;
rel.to: "elm.swallow.content";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
desc { "icononly";
inherit: "default";
rel1.to: "elm.swallow.content";
rel2.to: "elm.swallow.content";
desc { "icononly"; inherit;
fixed: 0 0;
rel.to: "elm.swallow.content";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}
@ -855,24 +855,21 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
text_class: "button_text";
}
}
desc { "visible";
inherit: "default";
rel1.to: "elm.swallow.content";
rel2.to: "elm.swallow.content";
desc { "visible"; inherit;
rel.to: "elm.swallow.content";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
desc { "icononly";
inherit: "default";
rel1.to: "elm.swallow.content";
rel2.to: "elm.swallow.content";
desc { "icononly"; inherit;
fixed: 0 0;
rel.to: "elm.swallow.content";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}

8
data/elementary/themes/edc/elm/check.edc
View File

@ -66,7 +66,7 @@ group { name: "elm/check/base/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
desc { "icononly"; inherit;
@ -74,7 +74,7 @@ group { name: "elm/check/base/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}
@ -370,7 +370,7 @@ group { name: "elm/check/base/toggle";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
desc { "icononly"; inherit;
@ -378,7 +378,7 @@ group { name: "elm/check/base/toggle";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}

2
data/elementary/themes/edc/elm/genlist.edc
View File

@ -1991,7 +1991,7 @@ group { "elm/genlist/item/icon_top_text_bottom/default"; nomouse;
ellipsis: -1;
align: 0.5 0.5;
text_class: "list_item";
text: "M";
text: SPACER_TEXT;
}
hid;
}

6
data/elementary/themes/edc/elm/naviframe.edc
View File

@ -140,7 +140,7 @@ group { name: "elm/naviframe/item/basic/default";
align: 0.5 0.0;
color: FN_COL_DEFAULT_SOFT_SHADOW;
text { font: FN; size: 8;
text: "X";
text: SPACER_TEXT;
text_class: "title_bar_sub";
align: 0.5 0.0;
min: 0 1;
@ -162,7 +162,7 @@ group { name: "elm/naviframe/item/basic/default";
align: 0.5 0.0;
color: FN_COL_DEFAULT_SOFT_SHADOW;
text { font: FNBD; size: 10;
text: "X";
text: SPACER_TEXT;
text_class: "title_bar";
align: 0.5 0.0;
min: 0 1;
@ -182,7 +182,7 @@ group { name: "elm/naviframe/item/basic/default";
align: 0.5 0.0;
color: FN_COL_DEFAULT_SOFT_SHADOW;
text { font: FN; size: 8;
text: "X";
text: SPACER_TEXT;
text_class: "title_bar_sub";
align: 0.5 0.0;
min: 0 1;

4
data/elementary/themes/edc/elm/progress.edc
View File

@ -107,7 +107,7 @@ group { name: "elm/progressbar/horizontal/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}
@ -482,7 +482,7 @@ group { name: "elm/progressbar/vertical/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}

4
data/elementary/themes/edc/elm/radio.edc
View File

@ -66,7 +66,7 @@ group { name: "elm/radio/base/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
desc { "icononly"; inherit;
@ -74,7 +74,7 @@ group { name: "elm/radio/base/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}

16
data/elementary/themes/edc/elm/slider.edc
View File

@ -250,7 +250,7 @@ group { name: "elm/slider/horizontal/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}
@ -326,7 +326,7 @@ group { name: "elm/slider/horizontal/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}
@ -967,7 +967,7 @@ group { name: "elm/slider/vertical/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}
@ -1044,7 +1044,7 @@ group { name: "elm/slider/vertical/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}
@ -1741,7 +1741,7 @@ group { name: "elm/slider/range/horizontal/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}
@ -1817,7 +1817,7 @@ group { name: "elm/slider/range/horizontal/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}
@ -2525,7 +2525,7 @@ group { name: "elm/slider/range/vertical/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}
@ -2602,7 +2602,7 @@ group { name: "elm/slider/range/vertical/default";
text {
min: 1 1;
ellipsis: -1;
text: "M";
text: SPACER_TEXT;
}
}
}

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

@ -7,6 +7,7 @@
#define FIXED_SIZE(_WIDTH, _HEIGHT) \
min: _WIDTH _HEIGHT; max: _WIDTH _HEIGHT; fixed: 1 1;
#define SPACER_TEXT "NN";
#define BACKGROUND_COMP LOSSY 99
//#define BACKGROUND_COMP LOSSY_ETC1