raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=712cf6a2ced0923b24e4ced3b47fc048d70db8bd
commit 712cf6a2ced0923b24e4ced3b47fc048d70db8bd
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Wed Mar 31 18:47:25 2021 +0100
elm theme - work on sizing of icons
---
data/elementary/themes/edc/button.edc | 5 +-
data/elementary/themes/edc/check.edc | 1 +
data/elementary/themes/edc/efl/button.edc | 79 +----------
data/elementary/themes/edc/efl/check.edc | 59 +-------
data/elementary/themes/edc/efl/progress.edc | 50 +------
data/elementary/themes/edc/efl/radio.edc | 30 +---
data/elementary/themes/edc/elm/bubble.edc | 171 ++++++-----------------
data/elementary/themes/edc/elm/button.edc | 116 ++--------------
data/elementary/themes/edc/elm/check.edc | 61 +--------
data/elementary/themes/edc/elm/genlist.edc | 43 +++---
data/elementary/themes/edc/elm/progress.edc | 50 +------
data/elementary/themes/edc/elm/radio.edc | 124 ++---------------
data/elementary/themes/edc/elm/slider.edc | 204 +++-------------------------
data/elementary/themes/edc/elm/toolbar.edc | 52 ++-----
data/elementary/themes/macros.edc | 16 ---
15 files changed, 151 insertions(+), 910 deletions(-)
diff --git a/data/elementary/themes/edc/button.edc
b/data/elementary/themes/edc/button.edc
index b408607702..1f938cc6c2 100644
--- a/data/elementary/themes/edc/button.edc
+++ b/data/elementary/themes/edc/button.edc
@@ -58,7 +58,7 @@ group { name: "e/widgets/button";
rel2.offset: 4 -5;
aspect: 1.0 1.0; aspect_preference: VERTICAL;
visible: 1;
- min: 16 16;
+ min: ICMIN ICMIN;
}
description { state: "icon" 0.0;
fixed: 0 0;
@@ -67,7 +67,7 @@ group { name: "e/widgets/button";
rel2.relative: 1.0 1.0;
rel2.offset: -5 -5;
visible: 1;
- min: 16 16;
+ min: ICMIN ICMIN;
}
}
part { name: "label_clip"; type: RECT;
@@ -96,6 +96,7 @@ group { name: "e/widgets/button";
ellipsis: -1;
}
offscale;
+ min: 0 ICMIN;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
diff --git a/data/elementary/themes/edc/check.edc
b/data/elementary/themes/edc/check.edc
index ad904ff2b6..f455396e60 100644
--- a/data/elementary/themes/edc/check.edc
+++ b/data/elementary/themes/edc/check.edc
@@ -61,6 +61,7 @@ group { name: "e/widgets/check";
text_class: "check_button";
}
offscale;
+ min: 0 ICMIN;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
diff --git a/data/elementary/themes/edc/efl/button.edc
b/data/elementary/themes/edc/efl/button.edc
index 04ee725d72..86c7fd1442 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -114,6 +114,7 @@ group { name: "efl/button";
fixed: 1 0;
aspect: 1.0 1.0;
visible: 1;
+ min: ICMIN ICMIN;
}
desc { "icononly"; inherit;
fixed: 0 0;
@@ -121,40 +122,12 @@ group { name: "efl/button";
rel2.relative: 1.0 1.0;
rel2.offset: -5 -5;
visible: 1;
- }
- }
- 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;
- rel.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
- }
- desc { "icononly"; inherit;
- fixed: 0 0;
- rel.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
text { "efl.text"; nomouse; required;
scale: 1;
desc { "default";
- fixed: 0 0;
color: 192 192 192 255;
rel1.offset: 0 6;
rel1.relative: 1.0 0.0;
@@ -166,16 +139,15 @@ group { name: "efl/button";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
desc { "visible"; inherit;
- fixed: 0 0;
rel1.offset: 6 6;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
}
desc { "pressed_visible"; inherit;
- fixed: 0 0;
color: 255 255 255 255;
rel1.offset: 6 6;
text.min: 1 1;
@@ -183,20 +155,17 @@ group { name: "efl/button";
visible: 1;
}
desc { "textonly"; inherit;
- fixed: 0 0;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
}
desc { "pressed_textonly"; inherit;
- fixed: 0 0;
color: 255 255 255 255;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
}
desc { "disabled_visible"; inherit;
- fixed: 0 0;
color: 96 96 96 255;
rel1.offset: 6 6;
text.min: 1 1;
@@ -204,7 +173,6 @@ group { name: "efl/button";
visible: 1;
}
desc { "disabled_textonly"; inherit;
- fixed: 0 0;
color: 96 96 96 255;
text.min: 1 1;
text.ellipsis: -1;
@@ -296,7 +264,6 @@ group { name: "efl/button:anchor";
if (m1 == (ICON | LABEL)) {
if (!d) {
set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
if (!p) {
set_state(PART:"efl.text", "visible", 0.0);
} else {
@@ -306,7 +273,6 @@ group { name: "efl/button:anchor";
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
set_state(PART:"efl.text", "disabled_visible", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -314,13 +280,11 @@ group { name: "efl/button:anchor";
} else if (m1 == (ICON)) {
if (!d) {
set_state(PART:"efl.content", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
set_state(PART:"efl.text", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"efl.content", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
set_state(PART:"efl.text", "default", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -328,7 +292,6 @@ group { name: "efl/button:anchor";
} else if (m1 == (LABEL)) {
if (!d) {
set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
if (!p) {
set_state(PART:"efl.text", "textonly", 0.0);
} else {
@@ -338,7 +301,6 @@ group { name: "efl/button:anchor";
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"efl.text", "disabled_textonly", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -346,12 +308,10 @@ group { name: "efl/button:anchor";
} else {
if (!d) {
set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
@@ -408,6 +368,7 @@ group { name: "efl/button:anchor";
fixed: 1 0;
aspect: 1.0 1.0;
visible: 1;
+ min: ICMIN ICMIN;
}
desc { "icononly";
inherit: "default";
@@ -416,34 +377,7 @@ group { name: "efl/button:anchor";
rel2.relative: 1.0 1.0;
rel2.offset: -5 -5;
visible: 1;
- }
- }
- 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;
- rel.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
- }
- desc { "icononly"; inherit;
- fixed: 0 0;
- rel.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
text { "efl.text"; nomouse; required;
@@ -461,6 +395,7 @@ group { name: "efl/button:anchor";
min: 0 0;
}
visible: 0;
+ min: 0 ICMIN;
}
desc { "visible";
inherit: "default";
@@ -476,7 +411,6 @@ group { name: "efl/button:anchor";
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
- fixed: 0 0;
}
desc { "textonly";
inherit: "default";
@@ -491,7 +425,6 @@ group { name: "efl/button:anchor";
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
- fixed: 0 0;
}
desc { "disabled_visible";
inherit: "default";
diff --git a/data/elementary/themes/edc/efl/check.edc
b/data/elementary/themes/edc/efl/check.edc
index f002899af9..be87511e07 100644
--- a/data/elementary/themes/edc/efl/check.edc
+++ b/data/elementary/themes/edc/efl/check.edc
@@ -87,6 +87,7 @@ group { name: "efl/check";
aspect: 1.0 1.0;
min: ICMIN ICMIN;
visible: 1;
+ min: ICMIN ICMIN;
}
desc { "icononly"; inherit;
fixed: 0 0;
@@ -95,33 +96,7 @@ group { name: "efl/check";
rel2.offset: -5 -5;
rel2.to_x: "";
visible: 1;
- }
- }
- 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;
- rel.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
- }
- desc { "icononly"; inherit;
- rel.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "base"; type: RECT;
@@ -192,6 +167,7 @@ group { name: "efl/check";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
desc { "visible"; inherit;
fixed: 0 0;
@@ -373,6 +349,7 @@ group { name: "efl/check:toggle";
fixed: 1 0;
aspect: 1.0 1.0;
visible: 1;
+ min: ICMIN ICMIN;
}
desc { "icononly"; inherit;
fixed: 0 0;
@@ -382,32 +359,7 @@ group { name: "efl/check:toggle";
rel2.to_x: "tog";
rel2.relative: 0.0 1.0;
visible: 1;
- }
- }
- text { "sizer_content"; nomouse;
- scale: 1;
- desc { "default";
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "button_text";
- }
- }
- desc { "visible"; inherit;
- rel.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
- }
- desc { "icononly"; inherit;
- rel.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
spacer { name: "tog"; scale: 1;
@@ -560,6 +512,7 @@ group { name: "efl/check:toggle";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
desc { "visible"; inherit;
fixed: 0 0;
diff --git a/data/elementary/themes/edc/efl/progress.edc
b/data/elementary/themes/edc/efl/progress.edc
index fcd333622f..c230060540 100644
--- a/data/elementary/themes/edc/efl/progress.edc
+++ b/data/elementary/themes/edc/efl/progress.edc
@@ -20,11 +20,9 @@ group { name: "efl/progressbar/horizontal";
}
if (ic) {
set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
set_state(PART:"bg", "iclabel", 0.0);
} else {
set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
if (l) {
set_state(PART:"bg", "iclabel", 0.0);
}
@@ -88,26 +86,7 @@ group { name: "efl/progressbar/horizontal";
// aspect: 1.0 1.0; aspect_preference: VERTICAL;
rel1.offset: 4 4;
rel2.offset: 4 -5;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "progressbar_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: 15 15;
}
}
part { name: "efl.text"; type: TEXT; mouse_events: 0;
@@ -129,6 +108,7 @@ group { name: "efl/progressbar/horizontal";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -389,11 +369,9 @@ group { name: "efl/progressbar/vertical";
}
if (ic) {
set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
set_state(PART:"bg", "iclabel", 0.0);
} else {
set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
if (l) {
set_state(PART:"bg", "iclabel", 0.0);
}
@@ -458,28 +436,7 @@ group { name: "efl/progressbar/vertical";
// aspect: 1.0 1.0; aspect_preference: HORIZONTAL;
rel1.offset: 4 4;
rel2.offset: -5 4;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 0 0;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "progressbar_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- fixed: 1 1;
- rel1.to: "efl.content";
- rel2.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "efl.text"; type: TEXT; mouse_events: 0;
@@ -501,6 +458,7 @@ group { name: "efl/progressbar/vertical";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
diff --git a/data/elementary/themes/edc/efl/radio.edc
b/data/elementary/themes/edc/efl/radio.edc
index 8f714d4c14..06dff6fe08 100644
--- a/data/elementary/themes/edc/efl/radio.edc
+++ b/data/elementary/themes/edc/efl/radio.edc
@@ -76,8 +76,8 @@ group { name: "efl/radio";
desc { "visible"; inherit;
fixed: 1 0;
aspect: 1.0 1.0;
- min: ICMIN ICMIN;
visible: 1;
+ min: ICMIN ICMIN;
}
desc { "icononly"; inherit;
fixed: 0 0;
@@ -86,32 +86,7 @@ group { name: "efl/radio";
rel2.offset: -5 -5;
rel2.to_x: "";
visible: 1;
- }
- }
- text { "sizer_content"; nomouse;
- scale: 1;
- desc { "default";
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "button_text";
- }
- }
- desc { "visible"; inherit;
- rel.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
- }
- desc { "icononly"; inherit;
- rel.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "base"; type: RECT;
@@ -171,6 +146,7 @@ group { name: "efl/radio";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
desc { "visible"; inherit;
fixed: 0 0;
diff --git a/data/elementary/themes/edc/elm/bubble.edc
b/data/elementary/themes/edc/elm/bubble.edc
index 1b61bb98f3..b7aa5c4c47 100644
--- a/data/elementary/themes/edc/elm/bubble.edc
+++ b/data/elementary/themes/edc/elm/bubble.edc
@@ -9,42 +9,23 @@ group { name: "elm/bubble/top_left/default";
}
}
part { name: "elm.swallow.icon"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
- fixed: 1 1;
+ fixed: 1 1;
visible: 0;
align: 0.0 0.0;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
rel1.offset: 4 4;
rel2 {
to_y: "elm.text";
relative: 0.0 1.0;
offset: 4 -5;
}
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "bubble";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.icon";
- rel2.to: "elm.swallow.icon";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
@@ -63,6 +44,7 @@ group { name: "elm/bubble/top_left/default";
offset: -5 4;
}
color: 255 255 255 255;
+ offscale;
text { font: FNBD; size: 10;
min: 0 1;
max: 0 1;
@@ -81,6 +63,7 @@ group { name: "elm/bubble/top_left/default";
rel2.relative: 1.0 0.0;
rel2.offset: -5 4;
color: 160 160 160 255;
+ offscale;
text { font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
@@ -91,6 +74,7 @@ group { name: "elm/bubble/top_left/default";
}
}
part { name: "base"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
color: 48 48 48 255;
rel1 {
@@ -111,36 +95,31 @@ group { name: "elm/bubble/top_left/default";
image.border: 0 24 12 0;
}
}
- part { name: "elm.swallow.content";
- type: SWALLOW;
+ part { name: "elm.swallow.content"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
rel1.to: "base";
rel1.offset: 5 9;
rel2.to: "base";
rel2.offset: -6 -7;
+ offscale;
}
}
}
programs {
- program {
- signal: "elm,state,icon,visible"; source: "elm";
+ program { signal: "elm,state,icon,visible"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.swallow.icon";
- target: "sizer_content";
}
- program {
- signal: "elm,state,icon,hidden"; source: "elm";
+ program { signal: "elm,state,icon,hidden"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.icon";
- target: "sizer_content";
}
- program {
- signal: "edje,state,rtl"; source: "edje";
+ program { signal: "edje,state,rtl"; source: "edje";
action: STATE_SET "rtl" 0.0;
target: "base";
}
- program {
- signal: "edje,state,ltr"; source: "edje";
+ program { signal: "edje,state,ltr"; source: "edje";
action: STATE_SET "default" 0.0;
target: "base";
}
@@ -157,6 +136,7 @@ group { name: "elm/bubble/top_right/default";
}
}
part { name: "elm.swallow.icon"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
@@ -169,31 +149,12 @@ group { name: "elm/bubble/top_right/default";
relative: 1.0 1.0;
offset: -5 -1;
}
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "bubble";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.icon";
- rel2.to: "elm.swallow.icon";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
@@ -208,6 +169,7 @@ group { name: "elm/bubble/top_right/default";
offset: -5 4;
}
color: 255 255 255 255;
+ offscale;
text { font: FNBD; size: 10;
min: 0 1;
max: 0 1;
@@ -227,6 +189,7 @@ group { name: "elm/bubble/top_right/default";
rel2.relative: 0.0 0.0;
rel2.offset: -5 4;
color: 160 160 160 255;
+ offscale;
text { font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
@@ -237,6 +200,7 @@ group { name: "elm/bubble/top_right/default";
}
}
part { name: "base"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
color: 48 48 48 255;
rel1 {
@@ -257,36 +221,31 @@ group { name: "elm/bubble/top_right/default";
image.border: 24 0 12 0;
}
}
- part { name: "elm.swallow.content";
- type: SWALLOW;
+ part { name: "elm.swallow.content"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
rel1.to: "base";
rel1.offset: 5 9;
rel2.to: "base";
rel2.offset: -6 -7;
+ offscale;
}
}
}
programs {
- program {
- signal: "elm,state,icon,visible"; source: "elm";
+ program { signal: "elm,state,icon,visible"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.swallow.icon";
- target: "sizer_content";
}
- program {
- signal: "elm,state,icon,hidden"; source: "elm";
+ program { signal: "elm,state,icon,hidden"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.icon";
- target: "sizer_content";
}
- program {
- signal: "edje,state,rtl"; source: "edje";
+ program { signal: "edje,state,rtl"; source: "edje";
action: STATE_SET "rtl" 0.0;
target: "base";
}
- program {
- signal: "edje,state,ltr"; source: "edje";
+ program { signal: "edje,state,ltr"; source: "edje";
action: STATE_SET "default" 0.0;
target: "base";
}
@@ -320,27 +279,7 @@ group { name: "elm/bubble/bottom_left/default";
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "bubble";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.icon";
- rel2.to: "elm.swallow.icon";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
@@ -417,25 +356,19 @@ group { name: "elm/bubble/bottom_left/default";
}
}
programs {
- program {
- signal: "elm,state,icon,visible"; source: "elm";
+ program { signal: "elm,state,icon,visible"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.swallow.icon";
- target: "sizer_content";
}
- program {
- signal: "elm,state,icon,hidden"; source: "elm";
+ program { signal: "elm,state,icon,hidden"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.icon";
- target: "sizer_content";
}
- program {
- signal: "edje,state,rtl"; source: "edje";
+ program { signal: "edje,state,rtl"; source: "edje";
action: STATE_SET "rtl" 0.0;
target: "base";
}
- program {
- signal: "edje,state,ltr"; source: "edje";
+ program { signal: "edje,state,ltr"; source: "edje";
action: STATE_SET "default" 0.0;
target: "base";
}
@@ -452,6 +385,7 @@ group { name: "elm/bubble/bottom_right/default";
}
}
part { name: "elm.swallow.icon"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
visible: 0;
@@ -465,31 +399,12 @@ group { name: "elm/bubble/bottom_right/default";
relative: 1.0 1.0;
offset: -5 -5;
}
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "bubble";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.icon";
- rel2.to: "elm.swallow.icon";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
@@ -507,6 +422,7 @@ group { name: "elm/bubble/bottom_right/default";
offset: -5 -5;
}
color: 255 255 255 255;
+ offscale;
text { font: FNBD; size: 10;
min: 0 1;
max: 0 1;
@@ -525,6 +441,7 @@ group { name: "elm/bubble/bottom_right/default";
rel2.to_x: "elm.swallow.icon";
rel2.relative: 0.0 1.0;
rel2.offset: -5 -5;
+ offscale;
color: 160 160 160 255;
text { font: FNBD; size: 10;
min: 1 1;
@@ -566,25 +483,19 @@ group { name: "elm/bubble/bottom_right/default";
}
}
programs {
- program {
- signal: "elm,state,icon,visible"; source: "elm";
+ program { signal: "elm,state,icon,visible"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.swallow.icon";
- target: "sizer_content";
}
- program {
- signal: "elm,state,icon,hidden"; source: "elm";
+ program { signal: "elm,state,icon,hidden"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.icon";
- target: "sizer_content";
}
- program {
- signal: "edje,state,rtl"; source: "edje";
+ program { signal: "edje,state,rtl"; source: "edje";
action: STATE_SET "rtl" 0.0;
target: "base";
}
- program {
- signal: "edje,state,ltr"; source: "edje";
+ program { signal: "edje,state,ltr"; source: "edje";
action: STATE_SET "default" 0.0;
target: "base";
}
diff --git a/data/elementary/themes/edc/elm/button.edc
b/data/elementary/themes/edc/elm/button.edc
index b9060b368b..9365a67189 100644
--- a/data/elementary/themes/edc/elm/button.edc
+++ b/data/elementary/themes/edc/elm/button.edc
@@ -80,6 +80,7 @@ group { name: "elm/button/base/default";
fixed: 1 0;
aspect: 1.0 1.0;
visible: 1;
+ min: ICMIN ICMIN;
}
desc { "icononly"; inherit;
fixed: 0 0;
@@ -87,40 +88,12 @@ group { name: "elm/button/base/default";
rel2.relative: 1.0 1.0;
rel2.offset: -5 -5;
visible: 1;
- }
- }
- 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;
- rel.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
- }
- desc { "icononly"; inherit;
- fixed: 0 0;
- rel.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
text { "elm.text"; nomouse;
scale: 1;
desc { "default";
- fixed: 1 1;
color: 192 192 192 255;
rel1.offset: 0 6;
rel1.relative: 1.0 0.0;
@@ -130,6 +103,7 @@ group { name: "elm/button/base/default";
align: 0.5 0.5;
min: 0 0;
}
+ min: 0 ICMIN;
visible: 0;
offscale;
}
@@ -276,7 +250,6 @@ group { name: "elm/button/base/anchor";
if (m1 == (ICON | LABEL)) {
if (!d) {
set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
if (!p) {
set_state(PART:"elm.text", "visible", 0.0);
} else {
@@ -286,7 +259,6 @@ group { name: "elm/button/base/anchor";
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
set_state(PART:"elm.text", "disabled_visible", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -294,13 +266,11 @@ group { name: "elm/button/base/anchor";
} else if (m1 == (ICON)) {
if (!d) {
set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -308,7 +278,6 @@ group { name: "elm/button/base/anchor";
} else if (m1 == (LABEL)) {
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
if (!p) {
set_state(PART:"elm.text", "textonly", 0.0);
} else {
@@ -318,7 +287,6 @@ group { name: "elm/button/base/anchor";
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"elm.text", "disabled_textonly", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -326,12 +294,10 @@ group { name: "elm/button/base/anchor";
} else {
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
@@ -374,6 +340,7 @@ group { name: "elm/button/base/anchor";
}
swallow { "elm.swallow.content"; nomouse;
clip_to: "icon_clip";
+ scale: 1;
desc { "default";
fixed: 1 0;
align: 0.0 0.5;
@@ -383,12 +350,14 @@ group { name: "elm/button/base/anchor";
rel2.offset: 4 -5;
rel2.to: "base";
visible: 0;
+ offscale;
}
desc { "visible";
inherit: "default";
fixed: 1 0;
aspect: 1.0 1.0;
visible: 1;
+ min: ICMIN ICMIN;
}
desc { "icononly";
inherit: "default";
@@ -397,34 +366,7 @@ group { name: "elm/button/base/anchor";
rel2.relative: 1.0 1.0;
rel2.offset: -5 -5;
visible: 1;
- }
- }
- 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;
- rel.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
- }
- desc { "icononly"; inherit;
- fixed: 0 0;
- rel.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
text { "elm.text"; nomouse;
@@ -441,6 +383,7 @@ group { name: "elm/button/base/anchor";
align: 0.5 0.5;
min: 0 0;
}
+ min: 0 ICMIN;
visible: 0;
}
desc { "visible";
@@ -798,13 +741,11 @@ group { name:
"elm/button/base/hoversel_vertical_entry/default";
if (m1 == (ICON | LABEL)) {
if (!d) {
set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
set_state(PART:"elm.text", "disabled", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -812,13 +753,11 @@ group { name:
"elm/button/base/hoversel_vertical_entry/default";
} else if (m1 == (ICON)) {
if (!d) {
set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -826,13 +765,11 @@ group { name:
"elm/button/base/hoversel_vertical_entry/default";
} else if (m1 == (LABEL)) {
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"elm.text", "disabled", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -840,12 +777,10 @@ group { name:
"elm/button/base/hoversel_vertical_entry/default";
} else {
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
@@ -876,6 +811,7 @@ group { name:
"elm/button/base/hoversel_vertical_entry/default";
}
swallow { "elm.swallow.content"; nomouse;
clip_to: "icon_clip";
+ scale: 1;
desc { "default";
fixed: 1 0;
align: 0.0 0.5;
@@ -884,12 +820,14 @@ group { name:
"elm/button/base/hoversel_vertical_entry/default";
rel2.relative: 0.0 1.0;
rel2.offset: 4 -5;
visible: 0;
+ offscale;
}
desc { "visible";
inherit: "default";
fixed: 1 0;
aspect: 1.0 1.0;
visible: 1;
+ min: ICMIN ICMIN;
}
desc { "icononly";
inherit: "default";
@@ -898,34 +836,7 @@ group { name:
"elm/button/base/hoversel_vertical_entry/default";
rel2.relative: 1.0 1.0;
rel2.offset: -5 -5;
visible: 1;
- }
- }
- 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;
- rel.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
- }
- desc { "icononly"; inherit;
- fixed: 0 0;
- rel.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
rect { "click_clip";
@@ -952,6 +863,7 @@ group { name:
"elm/button/base/hoversel_vertical_entry/default";
min: 1 1;
text_class: "button";
}
+ min: 0 ICMIN;
}
desc { "clicked";
inherit: "default";
@@ -1106,6 +1018,7 @@ group { name: "elm/button/base/hoversel_vertical/default";
rel2.relative: 0.0 1.0;
text.align: 0.0 0.5;
offscale;
+ min: 0 ICMIN;
}
desc { "visible"; inherit;
fixed: 0 0;
@@ -1422,6 +1335,7 @@ group { name:
"elm/button/base/hoversel_horizontal_entry/default";
text_class: "spinner";
ellipsis: -1;
}
+ min: 0 ICMIN;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0 ;
diff --git a/data/elementary/themes/edc/elm/check.edc
b/data/elementary/themes/edc/elm/check.edc
index 30ae5f2584..30802d0476 100644
--- a/data/elementary/themes/edc/elm/check.edc
+++ b/data/elementary/themes/edc/elm/check.edc
@@ -1,3 +1,4 @@
+
group { name: "elm/check/base/default";
script {
BUTTONMODE_SCRIPT
@@ -48,8 +49,8 @@ group { name: "elm/check/base/default";
desc { "visible"; inherit;
fixed: 1 0;
aspect: 1.0 1.0;
- min: ICMIN ICMIN;
visible: 1;
+ min: ICMIN ICMIN;
}
desc { "icononly"; inherit;
fixed: 0 0;
@@ -58,33 +59,7 @@ group { name: "elm/check/base/default";
rel2.offset: -5 -5;
rel2.to_x: "";
visible: 1;
- }
- }
- 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;
- rel.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
- }
- desc { "icononly"; inherit;
- rel.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "base"; type: RECT;
@@ -155,6 +130,7 @@ group { name: "elm/check/base/default";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
desc { "visible"; inherit;
fixed: 0 0;
@@ -368,6 +344,7 @@ group { name: "elm/check/base/toggle";
fixed: 1 0;
aspect: 1.0 1.0;
visible: 1;
+ min: ICMIN ICMIN;
}
desc { "icononly"; inherit;
fixed: 0 0;
@@ -377,32 +354,7 @@ group { name: "elm/check/base/toggle";
rel2.to_x: "tog";
rel2.relative: 0.0 1.0;
visible: 1;
- }
- }
- text { "sizer_content"; nomouse;
- scale: 1;
- desc { "default";
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "button_text";
- }
- }
- desc { "visible"; inherit;
- rel.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
- }
- desc { "icononly"; inherit;
- rel.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
spacer { name: "tog"; scale: 1;
@@ -555,6 +507,7 @@ group { name: "elm/check/base/toggle";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
desc { "visible"; inherit;
fixed: 0 0;
diff --git a/data/elementary/themes/edc/elm/genlist.edc
b/data/elementary/themes/edc/elm/genlist.edc
index 7a16eec32c..387542521b 100644
--- a/data/elementary/themes/edc/elm/genlist.edc
+++ b/data/elementary/themes/edc/elm/genlist.edc
@@ -95,6 +95,7 @@ group { "elm/genlist/item/group_index/default"; nomouse;
program_source: "elm";
text_class: "list_group_item";
}
link.base: "elm,state,enabled";
+ min: 0 ICMIN;
}
desc { "disabled";
inherit: "default";
@@ -268,6 +269,7 @@ group { "elm/genlist/item/default/default"; nomouse;
align: 0.0 0.5;
text_class: "list_item";
}
+ min: 0 ICMIN;
}
desc { "selected";
inherit: "default";
@@ -444,6 +446,7 @@ group { "elm/genlist/item/default_style/default"; nomouse;
text_class: "list_item";
style: "genlist_style";
}
+ min: 0 ICMIN;
}
desc { "selected";
inherit: "default";
@@ -623,6 +626,7 @@ group { "elm/genlist/item/one_icon/default"; nomouse;
align: 0.0 0.5;
text_class: "list_item";
}
+ min: 0 ICMIN;
}
desc { "selected";
inherit: "default";
@@ -756,6 +760,7 @@ group { "elm/genlist/item/end_icon/default"; nomouse;
align: 0.0 0.5;
text_class: "list_item";
}
+ min: 0 ICMIN;
}
desc { "selected";
inherit: "default";
@@ -883,6 +888,7 @@ group { "elm/genlist/item/no_icon/default"; nomouse;
align: 0.0 0.5;
text_class: "list_item";
}
+ min: 0 ICMIN;
}
desc { "selected";
inherit: "default";
@@ -1534,6 +1540,7 @@ group { "elm/genlist/item/icon_top_text_bottom/default";
nomouse;
align: 0.5 0.5;
text_class: "list_item";
}
+ min: 0 ICMIN;
}
desc { "selected";
inherit: "default";
@@ -1596,27 +1603,6 @@ group { "elm/genlist/item/icon_top_text_bottom/default";
nomouse;
target: "elm.text.flip";
}
//##//
- text { "sizer_content";
- scale;
- desc { "default";
- offscale;
- fixed: 1 1;
- rel1.to_x: "elm.swallow.pad";
- rel1.relative: 1.0 0.0;
- rel1.offset: 0 4;
- rel2.relative: 1.0 0.0;
- rel2.offset: -5 4;
- align: 0.5 0.0;
- text { font: FN; size: 10;
- min: 1 1;
- ellipsis: -1;
- align: 0.5 0.5;
- text_class: "list_item";
- text: SPACER_TEXT;
- }
- hid;
- }
- }
swallow { "elm.swallow.pad"; mouse;
scale;
desc { "default";
@@ -1635,8 +1621,12 @@ group { "elm/genlist/item/icon_top_text_bottom/default";
nomouse;
min: ICMIN ICMIN;
fixed: 1 1;
aspect: 1.0 1.0;
- rel1.to: "sizer_content";
- rel2.to: "sizer_content";
+ rel1.to_x: "elm.swallow.pad";
+ rel1.relative: 1.0 0.0;
+ rel1.offset: 0 4;
+ rel2.relative: 1.0 0.0;
+ rel2.offset: -5 4;
+ align: 0.5 0.0;
link.base: "elm,state,flip,disabled";
}
desc { "flip_enabled";
@@ -1657,7 +1647,7 @@
COMPRESS_ODD("elm/genlist/item_compress_odd/icon_top_text_bottom/default", "elm/
group { "elm/genlist/tree/icon_top_text_bottom/default";
inherit: "elm/genlist/item/icon_top_text_bottom/default";
parts {
- image { "sizer_content";
+ image { "elm.swallow.icon";
desc { "default";
rel1.to_x: "arrow";
rel1.offset: 4 4;
@@ -1784,6 +1774,7 @@ group { "elm/genlist/item/double_label/default"; nomouse;
align: 0.0 0.0;
text_class: "list_item";
}
+ min: 0 ICMIN;
}
desc { "selected";
inherit: "default";
@@ -2095,6 +2086,7 @@ group { "elm/genlist/item/message/default"; nomouse;
text_class: "list_item";
}
fixed: 0 1;
+ min: 0 ICMIN;
}
desc { "selected";
inherit: "default";
@@ -2144,6 +2136,7 @@ group { "elm/genlist/item/message/default"; nomouse;
align: 0.0 0.5;
text_class: "list_item";
}
+ min: 0 ICMIN;
}
desc { "selected";
inherit: "default";
@@ -2177,6 +2170,7 @@ group { "elm/genlist/item/message/default"; nomouse;
text_class: "list_item";
}
fixed: 0 1;
+ min: 0 ICMIN;
}
desc { "selected";
inherit: "default";
@@ -2762,6 +2756,7 @@ group { "elm/genlist/item/media-preview/default"; nomouse;
align: 0.0 0.0;
text_class: "list_item";
}
+ min: 0 ICMIN;
}
desc { "selected";
inherit: "default";
diff --git a/data/elementary/themes/edc/elm/progress.edc
b/data/elementary/themes/edc/elm/progress.edc
index 7cf14b7507..fdeaac7e34 100644
--- a/data/elementary/themes/edc/elm/progress.edc
+++ b/data/elementary/themes/edc/elm/progress.edc
@@ -19,11 +19,9 @@ group { name: "elm/progressbar/horizontal/default";
}
if (ic) {
set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
set_state(PART:"bg", "iclabel", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
if (l) {
set_state(PART:"bg", "iclabel", 0.0);
}
@@ -87,26 +85,7 @@ group { name: "elm/progressbar/horizontal/default";
// aspect: 1.0 1.0; aspect_preference: VERTICAL;
rel1.offset: 4 4;
rel2.offset: 4 -5;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "progressbar_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
@@ -128,6 +107,7 @@ group { name: "elm/progressbar/horizontal/default";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -387,11 +367,9 @@ group { name: "elm/progressbar/vertical/default";
}
if (ic) {
set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
set_state(PART:"bg", "iclabel", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
if (l) {
set_state(PART:"bg", "iclabel", 0.0);
}
@@ -456,28 +434,7 @@ group { name: "elm/progressbar/vertical/default";
// aspect: 1.0 1.0; aspect_preference: HORIZONTAL;
rel1.offset: 4 4;
rel2.offset: -5 4;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 0 0;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "progressbar_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- fixed: 1 1;
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
@@ -499,6 +456,7 @@ group { name: "elm/progressbar/vertical/default";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
diff --git a/data/elementary/themes/edc/elm/radio.edc
b/data/elementary/themes/edc/elm/radio.edc
index 608fbe86fb..b4854a1ae6 100644
--- a/data/elementary/themes/edc/elm/radio.edc
+++ b/data/elementary/themes/edc/elm/radio.edc
@@ -67,32 +67,7 @@ group { name: "elm/radio/base/default";
rel2.offset: -5 -5;
rel2.to_x: "";
visible: 1;
- }
- }
- text { "sizer_content"; nomouse;
- scale: 1;
- desc { "default";
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "button_text";
- }
- }
- desc { "visible"; inherit;
- rel.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
- }
- desc { "icononly"; inherit;
- rel.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "base"; type: RECT;
@@ -152,6 +127,7 @@ group { name: "elm/radio/base/default";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
desc { "visible"; inherit;
fixed: 0 0;
@@ -315,14 +291,12 @@ group { name: "elm/radio/base/plain";
if (m1 == (ICON | LABEL)) {
if (!d) {
set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
if (s) set_state(PART:"elm.text", "selected", 0.0);
else set_state(PART:"elm.text", "visible", 0.0);
set_state(PART:"clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
set_state(PART:"elm.text", "disabled_visible", 0.0);
set_state(PART:"clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -330,13 +304,11 @@ group { name: "elm/radio/base/plain";
} else if (m1 == (ICON)) {
if (!d) {
set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -344,14 +316,12 @@ group { name: "elm/radio/base/plain";
} else if (m1 == (LABEL)) {
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
if (s) set_state(PART:"elm.text", "selected", 0.0);
else set_state(PART:"elm.text", "visible", 0.0);
set_state(PART:"clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"elm.text", "disabled_visible", 0.0);
set_state(PART:"clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -359,13 +329,11 @@ group { name: "elm/radio/base/plain";
} else {
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -429,8 +397,8 @@ group { name: "elm/radio/base/plain";
inherit: "default" 0.0;
visible: 1;
align: 0.5 0.5;
- max: 9999 9999;
- min: 16 16;
+ min: ICMIN ICMIN;
+ max: -1 -1;
rel1.offset: 8 8;
rel2.relative: 1.0 1.0;
rel2.offset: -9 -9;
@@ -442,39 +410,8 @@ group { name: "elm/radio/base/plain";
aspect: 1.0 1.0;
rel1.offset: 8 8;
rel2.offset: 8 -9;
- max: 9999 9999;
- min: 16 16;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "radio_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: "M";
- }
- }
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: "M";
- }
+ min: ICMIN ICMIN;
+ max: -1 -1;
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
@@ -492,6 +429,7 @@ group { name: "elm/radio/base/plain";
text_class: "radio";
}
offscale;
+ min: 0 ICMIN;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
@@ -656,14 +594,12 @@ group { name: "elm/radio/base/icon";
if (m1 == (ICON | LABEL)) {
if (!d) {
set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
if (s) set_state(PART:"elm.text", "selected", 0.0);
else set_state(PART:"elm.text", "visible", 0.0);
set_state(PART:"clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
set_state(PART:"elm.text", "disabled_visible", 0.0);
set_state(PART:"clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -671,13 +607,11 @@ group { name: "elm/radio/base/icon";
} else if (m1 == (ICON)) {
if (!d) {
set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -685,14 +619,12 @@ group { name: "elm/radio/base/icon";
} else if (m1 == (LABEL)) {
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
if (s) set_state(PART:"elm.text", "selected", 0.0);
else set_state(PART:"elm.text", "visible", 0.0);
set_state(PART:"clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"elm.text", "disabled_visible", 0.0);
set_state(PART:"clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -700,13 +632,11 @@ group { name: "elm/radio/base/icon";
} else {
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -770,8 +700,8 @@ group { name: "elm/radio/base/icon";
inherit: "default" 0.0;
visible: 1;
align: 0.5 0.5;
- max: 9999 9999;
- min: 16 16;
+ min: ICMIN ICMIN;
+ max: -1 -1;
rel1.offset: 8 8;
rel2.offset: -9 -9;
rel2.relative: 1.0 1.0;
@@ -783,40 +713,9 @@ group { name: "elm/radio/base/icon";
aspect: 1.0 1.0;
rel1.offset: 8 8;
rel2.offset: -9 8;
- max: 9999 9999;
- min: 16 16;
- fixed: 1 1;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
+ min: ICMIN ICMIN;
+ max: -1 -1;
fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "radio_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: "M";
- }
- }
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: "M";
- }
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
@@ -834,6 +733,7 @@ group { name: "elm/radio/base/icon";
text_class: "radio";
}
offscale;
+ min: 0 ICMIN;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
diff --git a/data/elementary/themes/edc/elm/slider.edc
b/data/elementary/themes/edc/elm/slider.edc
index 744ee2fa1d..7ea8d24aae 100644
--- a/data/elementary/themes/edc/elm/slider.edc
+++ b/data/elementary/themes/edc/elm/slider.edc
@@ -91,17 +91,13 @@ group { name: "elm/slider/horizontal/default";
}
if (ic) {
set_state(PART:"elm.swallow.icon", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
} else {
set_state(PART:"elm.swallow.icon", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
}
if (e) {
set_state(PART:"elm.swallow.end", "visible", 0.0);
- set_state(PART:"sizer_content_end", "visible", 0.0);
} else {
set_state(PART:"elm.swallow.end", "default", 0.0);
- set_state(PART:"sizer_content_end", "default", 0.0);
}
if (!d) {
set_state(PART:"event", "default", 0.0);
@@ -181,6 +177,7 @@ group { name: "elm/slider/horizontal/default";
}
part { name: "elm.swallow.icon"; type: SWALLOW;
clip_to: "dis_clip";
+ scale;
description { state: "default" 0.0;
fixed: 1 0;
visible: 0;
@@ -196,27 +193,7 @@ group { name: "elm/slider/horizontal/default";
aspect: 1.0 1.0; aspect_preference: VERTICAL;
rel1.offset: 4 4;
rel2.offset: 4 -5;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "slider_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.icon";
- rel2.to: "elm.swallow.icon";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
@@ -238,6 +215,7 @@ group { name: "elm/slider/horizontal/default";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -255,6 +233,7 @@ group { name: "elm/slider/horizontal/default";
}
part { name: "elm.swallow.end"; type: SWALLOW;
clip_to: "dis_clip";
+ scale;
description { state: "default" 0.0;
fixed: 1 0;
visible: 0;
@@ -271,27 +250,7 @@ group { name: "elm/slider/horizontal/default";
aspect_preference: VERTICAL;
rel1.offset: -5 4;
rel2.offset: -5 -5;
- }
- }
- part { name: "sizer_content_end"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "slider_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.end";
- rel2.to: "elm.swallow.end";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
alias: "elm.units.min" "limits:elm.units.min";
@@ -773,17 +732,13 @@ group { name: "elm/slider/vertical/default";
}
if (ic) {
set_state(PART:"elm.swallow.icon", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
} else {
set_state(PART:"elm.swallow.icon", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
}
if (e) {
set_state(PART:"elm.swallow.end", "visible", 0.0);
- set_state(PART:"sizer_content_end", "visible", 0.0);
} else {
set_state(PART:"elm.swallow.end", "default", 0.0);
- set_state(PART:"sizer_content_end", "default", 0.0);
}
if (!d) {
set_state(PART:"event", "default", 0.0);
@@ -863,6 +818,7 @@ group { name: "elm/slider/vertical/default";
}
part { name: "elm.swallow.icon"; type: SWALLOW;
clip_to: "dis_clip";
+ scale;
description { state: "default" 0.0;
fixed: 0 1;
visible: 0;
@@ -880,27 +836,7 @@ group { name: "elm/slider/vertical/default";
aspect: 1.0 1.0; aspect_preference: VERTICAL;
rel1.offset: 4 4;
rel2.offset: -5 4;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "slider_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.icon";
- rel2.to: "elm.swallow.icon";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
@@ -922,6 +858,7 @@ group { name: "elm/slider/vertical/default";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -938,6 +875,7 @@ group { name: "elm/slider/vertical/default";
}
part { name: "elm.swallow.end"; type: SWALLOW;
clip_to: "dis_clip";
+ scale;
description { state: "default" 0.0;
fixed: 0 1;
visible: 0;
@@ -956,27 +894,7 @@ group { name: "elm/slider/vertical/default";
aspect_preference: VERTICAL;
rel1.offset: 4 -5;
rel2.offset: -5 -5;
- }
- }
- part { name: "sizer_content_end"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "slider_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.end";
- rel2.to: "elm.swallow.end";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
alias: "elm.units.min" "limits:elm.units.min";
@@ -1492,17 +1410,13 @@ group { name: "elm/slider/range/horizontal/default";
}
if (ic) {
set_state(PART:"elm.swallow.icon", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
} else {
set_state(PART:"elm.swallow.icon", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
}
if (e) {
set_state(PART:"elm.swallow.end", "visible", 0.0);
- set_state(PART:"sizer_content_end", "visible", 0.0);
} else {
set_state(PART:"elm.swallow.end", "default", 0.0);
- set_state(PART:"sizer_content_end", "default", 0.0);
}
if (!d) {
set_state(PART:"event", "default", 0.0);
@@ -1610,6 +1524,7 @@ group { name: "elm/slider/range/horizontal/default";
}
part { name: "elm.swallow.icon"; type: SWALLOW;
clip_to: "dis_clip";
+ scale;
description { state: "default" 0.0;
fixed: 1 0;
visible: 0;
@@ -1625,27 +1540,7 @@ group { name: "elm/slider/range/horizontal/default";
aspect: 1.0 1.0; aspect_preference: VERTICAL;
rel1.offset: 4 4;
rel2.offset: 4 -5;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "slider_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.icon";
- rel2.to: "elm.swallow.icon";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
@@ -1667,6 +1562,7 @@ group { name: "elm/slider/range/horizontal/default";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -1684,6 +1580,7 @@ group { name: "elm/slider/range/horizontal/default";
}
part { name: "elm.swallow.end"; type: SWALLOW;
clip_to: "dis_clip";
+ scale;
description { state: "default" 0.0;
fixed: 1 0;
visible: 0;
@@ -1700,27 +1597,7 @@ group { name: "elm/slider/range/horizontal/default";
aspect_preference: VERTICAL;
rel1.offset: -5 4;
rel2.offset: -5 -5;
- }
- }
- part { name: "sizer_content_end"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "slider_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.end";
- rel2.to: "elm.swallow.end";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
alias: "elm.units.min" "limits:elm.units.min";
@@ -2241,17 +2118,13 @@ group { name: "elm/slider/range/vertical/default";
}
if (ic) {
set_state(PART:"elm.swallow.icon", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
} else {
set_state(PART:"elm.swallow.icon", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
}
if (e) {
set_state(PART:"elm.swallow.end", "visible", 0.0);
- set_state(PART:"sizer_content_end", "visible", 0.0);
} else {
set_state(PART:"elm.swallow.end", "default", 0.0);
- set_state(PART:"sizer_content_end", "default", 0.0);
}
if (!d) {
set_state(PART:"event", "default", 0.0);
@@ -2359,6 +2232,7 @@ group { name: "elm/slider/range/vertical/default";
}
part { name: "elm.swallow.icon"; type: SWALLOW;
clip_to: "dis_clip";
+ scale;
description { state: "default" 0.0;
fixed: 0 1;
visible: 0;
@@ -2376,27 +2250,7 @@ group { name: "elm/slider/range/vertical/default";
aspect: 1.0 1.0; aspect_preference: VERTICAL;
rel1.offset: 4 4;
rel2.offset: -5 4;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "slider_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.icon";
- rel2.to: "elm.swallow.icon";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
@@ -2418,6 +2272,7 @@ group { name: "elm/slider/range/vertical/default";
}
visible: 0;
offscale;
+ min: 0 ICMIN;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -2434,6 +2289,7 @@ group { name: "elm/slider/range/vertical/default";
}
part { name: "elm.swallow.end"; type: SWALLOW;
clip_to: "dis_clip";
+ scale;
description { state: "default" 0.0;
fixed: 0 1;
visible: 0;
@@ -2452,27 +2308,7 @@ group { name: "elm/slider/range/vertical/default";
aspect_preference: VERTICAL;
rel1.offset: 4 -5;
rel2.offset: -5 -5;
- }
- }
- part { name: "sizer_content_end"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "slider_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.end";
- rel2.to: "elm.swallow.end";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
+ min: ICMIN ICMIN;
}
}
alias: "elm.units.min" "limits:elm.units.min";
diff --git a/data/elementary/themes/edc/elm/toolbar.edc
b/data/elementary/themes/edc/elm/toolbar.edc
index ddf7c84fbe..88907d4215 100644
--- a/data/elementary/themes/edc/elm/toolbar.edc
+++ b/data/elementary/themes/edc/elm/toolbar.edc
@@ -344,13 +344,11 @@ group { name: "elm/toolbar/item/default";
if (!d) {
set_state(PART:"elm.swallow.icon", "default", 0.0);
set_state(PART:"elm.swallow.icon_new", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"elm.text", "default", 0.0);
} else {
set_state(PART:"elm.swallow.icon", "default", 0.0);
set_state(PART:"elm.swallow.icon_new", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"elm.text", "disabled", 0.0);
}
@@ -358,13 +356,11 @@ group { name: "elm/toolbar/item/default";
if (!d) {
set_state(PART:"elm.swallow.icon", "icononly", 0.0);
set_state(PART:"elm.swallow.icon_new", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"elm.text", "icononly", 0.0);
} else {
set_state(PART:"elm.swallow.icon", "icononly", 0.0);
set_state(PART:"elm.swallow.icon_new", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"elm.text", "icononly", 0.0);
}
@@ -372,13 +368,11 @@ group { name: "elm/toolbar/item/default";
if (!d) {
set_state(PART:"elm.swallow.icon", "noicon", 0.0);
set_state(PART:"elm.swallow.icon_new", "noicon", 0.0);
- set_state(PART:"sizer_content", "noicon", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"elm.text", "noicon", 0.0);
} else {
set_state(PART:"elm.swallow.icon", "noicon", 0.0);
set_state(PART:"elm.swallow.icon_new", "noicon", 0.0);
- set_state(PART:"sizer_content", "noicon", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"elm.text", "noicon_disabled", 0.0);
}
@@ -386,13 +380,11 @@ group { name: "elm/toolbar/item/default";
if (!d) {
set_state(PART:"elm.swallow.icon", "noicon", 0.0);
set_state(PART:"elm.swallow.icon_new", "noicon", 0.0);
- set_state(PART:"sizer_content", "noicon", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"elm.text", "noicon", 0.0);
} else {
set_state(PART:"elm.swallow.icon", "noicon", 0.0);
set_state(PART:"elm.swallow.icon_new", "noicon", 0.0);
- set_state(PART:"sizer_content", "noicon", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"elm.text", "noicon_disabled", 0.0);
}
@@ -432,33 +424,6 @@ group { name: "elm/toolbar/item/default";
visible: 0;
}
}
- text { "sizer_content"; nomouse; scale: 1;
- desc { "default";
- min: 16 16;
- visible: 0;
- text { font: FN; size: 10;
- min: 1 1;
- text_class: "toolbar_item";
- }
- }
- desc { "noicon"; inherit;
- rel.to: "elm.swallow.icon_new";
- text {
- min: 0 0;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
- fixed: 1 1;
- }
- desc { "icononly"; inherit;
- rel.to: "elm.swallow.icon_new";
- text {
- min: 1 1;
- ellipsis: -1;
- text: SPACER_TEXT;
- }
- }
- }
part { name: "elm.swallow.icon"; type: SWALLOW;
clip_to: "icon_clip1";
@@ -470,6 +435,7 @@ group { name: "elm/toolbar/item/default";
rel2.to_y: "elm.text";
rel2.relative: 1.0 0.0;
rel2.offset: -5 -5;
+ min: ICMIN ICMIN;
offscale;
}
description { state: "noicon" 0.0;
@@ -478,6 +444,7 @@ group { name: "elm/toolbar/item/default";
rel1.offset: 4 0;
rel2.relative: 1.0 0.0;
rel2.offset: -5 -5;
+ min: 0 0;
}
description { state: "icononly" 0.0;
inherit: "default" 0.0;
@@ -485,6 +452,7 @@ group { name: "elm/toolbar/item/default";
rel2.relative: 1.0 1.0;
rel2.offset: -5 -5;
rel2.to_y: "icon_clip";
+ min: ICMIN ICMIN;
}
}
part { name: "icon_clip2"; type: RECT;
@@ -509,6 +477,7 @@ group { name: "elm/toolbar/item/default";
rel2.to_y: "elm.text";
rel2.relative: 1.0 0.0;
rel2.offset: -5 -5;
+ min: ICMIN ICMIN;
offscale;
}
description { state: "noicon" 0.0;
@@ -517,6 +486,7 @@ group { name: "elm/toolbar/item/default";
rel1.offset: 4 0;
rel2.relative: 1.0 0.0;
rel2.offset: -5 0;
+ min: 0 0;
}
description { state: "icononly" 0.0;
inherit: "default" 0.0;
@@ -524,6 +494,7 @@ group { name: "elm/toolbar/item/default";
rel2.relative: 1.0 1.0;
rel2.offset: -5 -5;
rel2.to_y: "icon_clip";
+ min: ICMIN ICMIN;
}
}
@@ -907,8 +878,7 @@ group { name: "elm/toolbar/item/item_horizontal";
rel2.relative: 0.0 1.0;
rel2.offset: 4 -5;
offscale;
- min: 16 16;
- max: 16 16;
+ min: ICMIN ICMIN;
}
description { state: "noicon" 0.0;
inherit: "default" 0.0;
@@ -917,7 +887,6 @@ group { name: "elm/toolbar/item/item_horizontal";
rel2.relative: 0.0 1.0;
rel2.offset: 0 -5;
min: 0 0;
- max: 0 0;
fixed: 1 1;
}
description { state: "icononly" 0.0;
@@ -925,6 +894,7 @@ group { name: "elm/toolbar/item/item_horizontal";
rel2.relative: 1.0 1.0;
rel2.offset: -5 -5;
rel2.to_x: "icon_clip";
+ min: ICMIN ICMIN;
}
}
part { name: "icon_clip2"; type: RECT;
@@ -949,9 +919,7 @@ group { name: "elm/toolbar/item/item_horizontal";
rel2.relative: 0.0 1.0;
rel2.offset: 4 -5;
offscale;
- min: 16 16;
- max: 16 16;
- fixed: 1 1;
+ min: ICMIN ICMIN;
}
description { state: "noicon" 0.0;
inherit: "default" 0.0;
@@ -960,13 +928,13 @@ group { name: "elm/toolbar/item/item_horizontal";
rel2.relative: 0.0 1.0;
rel2.offset: 0 -5;
min: 0 0;
- max: 0 0;
}
description { state: "icononly" 0.0;
inherit: "default" 0.0;
rel2.relative: 1.0 1.0;
rel2.offset: -5 -5;
rel2.to_x: "icon_clip";
+ min: ICMIN ICMIN;
}
}
diff --git a/data/elementary/themes/macros.edc
b/data/elementary/themes/macros.edc
index 16d838c180..158ffa5822 100644
--- a/data/elementary/themes/macros.edc
+++ b/data/elementary/themes/macros.edc
@@ -301,7 +301,6 @@
if (m1 == (ICON | LABEL)) { \
if (!d) { \
set_state(PART:"elm.swallow.content", "visible", 0.0); \
- set_state(PART:"sizer_content", "visible", 0.0); \
set_state(PART:"event", "default", 0.0); \
if (!p) { \
set_state(PART:"elm.text", "visible", 0.0); \
@@ -312,7 +311,6 @@
} \
} else { \
set_state(PART:"elm.swallow.content", "visible", 0.0); \
- set_state(PART:"sizer_content", "visible", 0.0); \
set_state(PART:"elm.text", "disabled_visible", 0.0); \
set_state(PART:"icon_clip", "disabled", 0.0); \
set_state(PART:"event", "disabled", 0.0); \
@@ -320,7 +318,6 @@
} else if (m1 == (ICON)) { \
if (!d) { \
set_state(PART:"elm.swallow.content", "icononly", 0.0); \
- set_state(PART:"sizer_content", "icononly", 0.0); \
set_state(PART:"event", "default", 0.0); \
set_state(PART:"elm.text", "default", 0.0); \
if (!p) \
@@ -329,7 +326,6 @@
set_state(PART:"icon_clip", "pressed", 0.0); \
} else { \
set_state(PART:"elm.swallow.content", "icononly", 0.0); \
- set_state(PART:"sizer_content", "icononly", 0.0); \
set_state(PART:"elm.text", "default", 0.0); \
set_state(PART:"icon_clip", "disabled", 0.0); \
set_state(PART:"event", "disabled", 0.0); \
@@ -337,7 +333,6 @@
} else if (m1 == (LABEL)) { \
if (!d) { \
set_state(PART:"elm.swallow.content", "default", 0.0); \
- set_state(PART:"sizer_content", "default", 0.0); \
set_state(PART:"icon_clip", "default", 0.0); \
set_state(PART:"event", "default", 0.0); \
if (!p) \
@@ -346,7 +341,6 @@
set_state(PART:"elm.text", "pressed_textonly", 0.0); \
} else { \
set_state(PART:"elm.swallow.content", "default", 0.0); \
- set_state(PART:"sizer_content", "default", 0.0); \
set_state(PART:"elm.text", "disabled_textonly", 0.0); \
set_state(PART:"icon_clip", "disabled", 0.0); \
set_state(PART:"event", "disabled", 0.0); \
@@ -354,12 +348,10 @@
} else { \
if (!d) { \
set_state(PART:"elm.swallow.content", "default", 0.0); \
- set_state(PART:"sizer_content", "default", 0.0); \
set_state(PART:"icon_clip", "default", 0.0); \
set_state(PART:"event", "default", 0.0); \
} else { \
set_state(PART:"elm.swallow.content", "default", 0.0); \
- set_state(PART:"sizer_content", "default", 0.0); \
set_state(PART:"icon_clip", "disabled", 0.0); \
set_state(PART:"event", "disabled", 0.0); \
} \
@@ -401,7 +393,6 @@
if (m1 == (ICON | LABEL)) { \
if (!d) { \
set_state(PART:"efl.content", "visible", 0.0); \
- set_state(PART:"sizer_content", "visible", 0.0); \
set_state(PART:"event", "default", 0.0); \
if (!p) { \
set_state(PART:"efl.text", "visible", 0.0); \
@@ -412,7 +403,6 @@
} \
} else { \
set_state(PART:"efl.content", "visible", 0.0); \
- set_state(PART:"sizer_content", "visible", 0.0); \
set_state(PART:"efl.text", "disabled_visible", 0.0); \
set_state(PART:"icon_clip", "disabled", 0.0); \
set_state(PART:"event", "disabled", 0.0); \
@@ -420,7 +410,6 @@
} else if (m1 == (ICON)) { \
if (!d) { \
set_state(PART:"efl.content", "icononly", 0.0); \
- set_state(PART:"sizer_content", "icononly", 0.0); \
set_state(PART:"event", "default", 0.0); \
set_state(PART:"efl.text", "default", 0.0); \
if (!p) \
@@ -429,7 +418,6 @@
set_state(PART:"icon_clip", "pressed", 0.0); \
} else { \
set_state(PART:"efl.content", "icononly", 0.0); \
- set_state(PART:"sizer_content", "icononly", 0.0); \
set_state(PART:"efl.text", "default", 0.0); \
set_state(PART:"icon_clip", "disabled", 0.0); \
set_state(PART:"event", "disabled", 0.0); \
@@ -437,7 +425,6 @@
} else if (m1 == (LABEL)) { \
if (!d) { \
set_state(PART:"efl.content", "default", 0.0); \
- set_state(PART:"sizer_content", "default", 0.0); \
set_state(PART:"icon_clip", "default", 0.0); \
set_state(PART:"event", "default", 0.0); \
if (!p) \
@@ -446,7 +433,6 @@
set_state(PART:"efl.text", "pressed_textonly", 0.0); \
} else { \
set_state(PART:"efl.content", "default", 0.0); \
- set_state(PART:"sizer_content", "default", 0.0); \
set_state(PART:"efl.text", "disabled_textonly", 0.0); \
set_state(PART:"icon_clip", "disabled", 0.0); \
set_state(PART:"event", "disabled", 0.0); \
@@ -454,12 +440,10 @@
} else { \
if (!d) { \
set_state(PART:"efl.content", "default", 0.0); \
- set_state(PART:"sizer_content", "default", 0.0); \
set_state(PART:"icon_clip", "default", 0.0); \
set_state(PART:"event", "default", 0.0); \
} else { \
set_state(PART:"efl.content", "default", 0.0); \
- set_state(PART:"sizer_content", "default", 0.0); \
set_state(PART:"icon_clip", "disabled", 0.0); \
set_state(PART:"event", "disabled", 0.0); \
} \
--
