TH - fix toolbar sizing when no icons

This commit is contained in:
Carsten Haitzler 2019-01-30 09:53:53 +00:00
parent 042888c0dd
commit 5b13eff273
1 changed files with 28 additions and 6 deletions

View File

@ -40,6 +40,7 @@ group { name: "e/widgets/toolbar";
scale: 1;
clip_to: "arrow_clipper";
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "base";
rel2.to: "base";
align: 0.0 0.5;
@ -55,6 +56,7 @@ group { name: "e/widgets/toolbar";
scale: 1;
clip_to: "arrow_clipper";
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "arrow1_ev";
rel2.to: "arrow1_ev";
image.normal: "calendar_prev.png";
@ -70,6 +72,7 @@ group { name: "e/widgets/toolbar";
scale: 1;
clip_to: "arrow_clipper";
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "base";
rel2.to: "base";
align: 1.0 0.5;
@ -85,6 +88,7 @@ group { name: "e/widgets/toolbar";
scale: 1;
clip_to: "arrow_clipper";
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "arrow2_ev";
rel2.to: "arrow2_ev";
image.normal: "calendar_next.png";
@ -209,6 +213,7 @@ group { name: "e/widgets/toolbar/item";
rel2.offset: -5 -10;
align: 0.5 1.0;
color: 160 160 160 255;
visible: 0;
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
@ -219,12 +224,27 @@ group { name: "e/widgets/toolbar/item";
}
description { state: "noicon" 0.0;
inherit: "default" 0.0;
visible: 0;
text.min: 0 0;
rel1.relative: 0.0 0.0;
rel1.offset: 4 4;
}
description { state: "disabled" 0.0;
}
part { name: "label2"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
rel.to: "e.text.label";
align: 0.5 1.0;
color: 160 160 160 255;
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
align: 0.5 0.5;
text_class: "menu_item";
text_source: "e.text.label";
}
fixed: 0 1;
}
description { state: "noicon" 0.0;
inherit: "default" 0.0;
color: 96 96 96 255;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
@ -264,18 +284,20 @@ group { name: "e/widgets/toolbar/item";
action: STATE_SET "noicon" 0.0;
target: "e.swallow.icon";
target: "e.text.label";
target: "label2";
}
program {
signal: "e,icon,enabled"; source: "e";
action: STATE_SET "default" 0.0;
target: "e.swallow.icon";
target: "e.text.label";
target: "label2";
}
program {
signal: "e,state,selected"; source: "e";
action: STATE_SET "selected" 0.0;
transition: ACCELERATE 0.2;
target: "e.text.label";
target: "label2";
target: "base";
target: "bar";
}
@ -283,7 +305,7 @@ group { name: "e/widgets/toolbar/item";
signal: "e,state,unselected"; source: "e";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.2;
target: "e.text.label";
target: "label2";
target: "base";
target: "bar";
}