raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=785ad1a8a4a8a70529b23e97f1a5cf10f2a30113
commit 785ad1a8a4a8a70529b23e97f1a5cf10f2a30113 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Thu Jan 16 16:37:51 2020 +0000 TH - fix toolbar item sizing --- data/elementary/themes/edc/elm/toolbar.edc | 47 +++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/data/elementary/themes/edc/elm/toolbar.edc b/data/elementary/themes/edc/elm/toolbar.edc index 310f8dd5c4..070eaa881d 100644 --- a/data/elementary/themes/edc/elm/toolbar.edc +++ b/data/elementary/themes/edc/elm/toolbar.edc @@ -357,40 +357,56 @@ group { name: "elm/toolbar/item/default"; if (m1 == (ICON | LABEL)) { 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); } } else if (m1 == (ICON)) { 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); } } else if (m1 == (LABEL)) { 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); } } else { 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); } @@ -409,7 +425,7 @@ group { name: "elm/toolbar/item/default"; visible: 1; } } - + part { name: "icon_clip"; type: RECT; description { state: "default" 0.0; } @@ -430,6 +446,33 @@ 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"; + text { + min: 0 0; + ellipsis: -1; + text: SPACER_TEXT; + } + } + desc { "icononly"; inherit; + rel.to: "elm.swallow.icon"; + text { + min: 1 1; + ellipsis: -1; + text: SPACER_TEXT; + } + } + } + part { name: "elm.swallow.icon"; type: SWALLOW; clip_to: "icon_clip1"; scale: 1; @@ -448,6 +491,7 @@ group { name: "elm/toolbar/item/default"; rel1.offset: 4 0; rel2.relative: 1.0 0.0; rel2.offset: -5 -5; + fixed: 1 1; } description { state: "icononly" 0.0; inherit: "default" 0.0; @@ -487,6 +531,7 @@ group { name: "elm/toolbar/item/default"; rel1.offset: 4 0; rel2.relative: 1.0 0.0; rel2.offset: -5 0; + fixed: 1 1; } description { state: "icononly" 0.0; inherit: "default" 0.0; --
