elm theme - make about dialogs scale more nicely - also match buttons

This commit is contained in:
Carsten Haitzler 2021-04-10 12:40:34 +01:00
parent be9e83e0db
commit 220992f85c
2 changed files with 68 additions and 35 deletions

View File

@ -66,6 +66,7 @@ group { name: "e/widgets/about/main";
min: 0 1;
align: 0.5 0.0;
}
offscale;
}
description { state: "up" 0.0;
inherit: "default" 0.0;
@ -104,6 +105,7 @@ group { name: "e/widgets/about/main";
min: 0 1;
align: 0.5 0.0;
}
offscale;
}
description { state: "up" 0.0;
inherit: "default" 0.0;
@ -154,6 +156,7 @@ group { name: "e/widgets/about/main";
rel1.relative: 0.0 0.0;
rel2.relative: 1.0 0.0;
FIXED_SIZE(75, 75)
offscale;
}
}
////////////////////////////////////////////////////////////////
@ -173,6 +176,7 @@ group { name: "e/widgets/about/main";
ellipsis: -1;
text_class: "about_title";
}
offscale;
}
}
////////////////////////////////////////////////////////////////
@ -192,6 +196,7 @@ group { name: "e/widgets/about/main";
ellipsis: -1;
text_class: "about_version";
}
offscale;
}
}
////////////////////////////////////////////////////////////////
@ -205,6 +210,7 @@ group { name: "e/widgets/about/main";
aspect: (255/180) (255/180); aspect_preference: HORIZONTAL; \
rel1.relative: 0.0 1.0; \
color: 64 64 64 255; \
offscale; \
} \
}
TRI("t1", 127, 0.5)
@ -222,6 +228,7 @@ group { name: "e/widgets/about/main";
description { state: "default" 0.0;
rel.to: "base";
WIN_SHADOW_SMALL;
offscale;
}
description { state: "clicked" 0.0;
inherit;
@ -231,12 +238,14 @@ group { name: "e/widgets/about/main";
}
}
part { name: "base"; type: RECT;
scale: 1;
description { state: "default" 0.0;
rel1.offset: -6 -6;
rel1.to: "e.text.label";
rel2.offset: 5 5;
rel2.to: "e.text.label";
color: 51 153 255 255;
offscale;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
@ -258,35 +267,31 @@ group { name: "e/widgets/about/main";
ellipsis: -1;
text_class: "button";
}
offscale;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
}
program {
signal: "mouse,down,1*"; source: "base";
program { signal: "mouse,down,1*"; source: "base";
action: STATE_SET "clicked" 0.0;
target: "base";
target: "shadow";
}
program {
signal: "mouse,up,1"; source: "base";
program { signal: "mouse,up,1"; source: "base";
action: STATE_SET "default" 0.0;
target: "base";
target: "shadow";
}
program {
signal: "mouse,clicked,1*"; source: "base";
program { signal: "mouse,clicked,1*"; source: "base";
action: SIGNAL_EMIT "e,action,close" "";
}
program {
signal: "e,state,focused"; source: "e";
program { signal: "e,state,focused"; source: "e";
action: STATE_SET "focused" 0.0;
target: "lines";
}
program {
signal: "e,state,unfocused"; source: "e";
program { signal: "e,state,unfocused"; source: "e";
action: STATE_SET "default" 0.0;
target: "lines";
}

View File

@ -2,6 +2,7 @@ group { name: "e/theme/about";
// data.item: "borderless" "1";
// data.item: "shaped" "1";
images.image: "about-flat-bg.png" COMP;
images.image: "win_shadow.png" COMP;
min: 220 320;
parts {
part { name: "sizer"; type: SPACER;
@ -51,6 +52,7 @@ group { name: "e/theme/about";
ellipsis: -1;
align: 0.5 0.5;
}
offscale;
}
}
part { name: "name2"; type: TEXT; mouse_events: 0;
@ -58,11 +60,10 @@ group { name: "e/theme/about";
description { state: "default" 0.0;
fixed: 1 1;
color: 255 255 255 192;
rel.to: "name";
rel1.relative: 0.0 1.0;
rel1.to: "name";
rel1.offset: 0 16;
rel2.relative: 1.0 1.0;
rel2.to: "name";
rel2.offset: -1 16;
align: 0.5 0.0;
text { font: FN; size: 10;
@ -71,20 +72,36 @@ group { name: "e/theme/about";
ellipsis: -1;
align: 0.5 0.0;
}
offscale;
}
}
////////////////////////////////////////////////////////////////
part { name: "base"; type: RECT;
part { name: "shadow"; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
rel.to: "base";
WIN_SHADOW_SMALL;
offscale;
}
description { state: "clicked" 0.0;
inherit;
image.border_scale_by: 0.25;
rel1.offset: -5 -3;
rel2.offset: 4 6;
}
}
part { name: "base"; type: RECT;
scale: 1;
description { state: "default" 0.0;
rel.to: "e.text.label";
rel1.offset: -6 -6;
rel1.to: "e.text.label";
rel2.offset: 5 5;
rel2.to: "e.text.label";
color: 48 48 48 255;
color: 51 153 255 255;
offscale;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
color: 32 32 32 255;
color: 255 153 51 255;
}
}
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
@ -94,7 +111,7 @@ group { name: "e/theme/about";
rel1.relative: 1.0 1.0;
rel2.offset: -14 -14;
rel2.relative: 1.0 1.0;
color: 160 160 160 255;
color: 255 255 255 255;
align: 1.0 1.0;
min: 85 0;
text { font: FN; size: 10;
@ -104,40 +121,53 @@ group { name: "e/theme/about";
text_class: "button";
}
fixed: 1 1;
offscale;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
}
program {
signal: "mouse,down,1*"; source: "base";
program { signal: "mouse,down,1*"; source: "base";
action: STATE_SET "clicked" 0.0;
target: "base";
target: "shadow";
target: "e.text.label";
}
program {
signal: "mouse,up,1"; source: "base";
program { signal: "mouse,up,1"; source: "base";
action: STATE_SET "default" 0.0;
target: "base";
target: "shadow";
target: "e.text.label";
}
program {
signal: "mouse,clicked,1*"; source: "base";
program { signal: "mouse,clicked,1*"; source: "base";
action: SIGNAL_EMIT "e,action,close" "";
}
////////////////////////////////////////////////////////////////
part { name: "shadow2"; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
rel.to: "base2";
WIN_SHADOW_SMALL;
offscale;
}
description { state: "clicked" 0.0;
inherit;
image.border_scale_by: 0.25;
rel1.offset: -5 -3;
rel2.offset: 4 6;
}
}
part { name: "base2"; type: RECT;
description { state: "default" 0.0;
rel.to: "e.text.theme";
rel1.offset: -6 -6;
rel1.to: "e.text.theme";
rel2.offset: 5 5;
rel2.to: "e.text.theme";
color: 48 48 48 255;
color: 51 153 255 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
color: 32 32 32 255;
color: 255 153 51 255;
}
}
part { name: "e.text.theme"; type: TEXT; mouse_events: 0;
@ -147,7 +177,7 @@ group { name: "e/theme/about";
rel1.relative: 0.0 1.0;
rel2.offset: 13 -14;
rel2.relative: 0.0 1.0;
color: 160 160 160 255;
color: 255 255 255 255;
align: 0.0 1.0;
min: 85 0;
text { font: FN; size: 10;
@ -157,26 +187,24 @@ group { name: "e/theme/about";
text_class: "button";
}
fixed: 1 1;
offscale;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
}
program {
signal: "mouse,down,1*"; source: "base2";
program { signal: "mouse,down,1*"; source: "base2";
action: STATE_SET "clicked" 0.0;
target: "base2";
target: "e.text.theme";
}
program {
signal: "mouse,up,1"; source: "base2";
program { signal: "mouse,up,1"; source: "base2";
action: STATE_SET "default" 0.0;
target: "base2";
target: "e.text.theme";
}
program {
signal: "mouse,clicked,1*"; source: "base2";
program { signal: "mouse,clicked,1*"; source: "base2";
action: SIGNAL_EMIT "e,action,settings,theme" "";
}
}