raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=dfa82c2e363292bb71dea88db70d320603bc1317
commit dfa82c2e363292bb71dea88db70d320603bc1317 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Tue Dec 4 18:51:11 2018 +0000 TH - dialogs --- data/elementary/themes/edc/conf.edc | 19 +++++++-------- data/elementary/themes/edc/dialog.edc | 45 ++++++++++++++++------------------- 2 files changed, 29 insertions(+), 35 deletions(-) diff --git a/data/elementary/themes/edc/conf.edc b/data/elementary/themes/edc/conf.edc index 02e62f02e3..4bb007f5d1 100644 --- a/data/elementary/themes/edc/conf.edc +++ b/data/elementary/themes/edc/conf.edc @@ -1,33 +1,30 @@ group { name: "e/widgets/configure/main"; - images.image: "separator_horiz.png" COMP; parts { part { name: "base"; type: RECT; description { state: "default" 0.0; - color_class: "dialog_base"; color: 64 64 64 255; } } - part { name: "separator"; mouse_events: 0; + part { name: "separator"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - min: 16 2; - max: 99999 2; + min: 16 1; + max: 99999 1; rel1.relative: 0.0 1.0; rel1.offset: 0 0; rel1.to_y: "e.swallow.content"; rel2.relative: 1.0 0.0; rel2.offset: -1 -1; rel2.to_y: "e.swallow.button"; - image.normal: "separator_horiz.png"; - fill.smooth: 0; fixed: 0 1; + color: 72 72 72 255; } } part { name: "e.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1.offset: 4 4; + rel1.offset: 8 8; rel1.to_x: "base"; rel2.relative: 1.0 0.0; - rel2.offset: -5 -8; + rel2.offset: -9 -17; rel2.to_y: "e.swallow.button"; } } @@ -35,9 +32,9 @@ group { name: "e/widgets/configure/main"; description { state: "default" 0.0; align: 0.5 1.0; rel1.relative: 0.5 1.0; - rel1.offset: 0 -5; + rel1.offset: 0 -9; rel2.relative: 0.5 1.0; - rel2.offset: -1 -5; + rel2.offset: -1 -9; fixed: 1 1; } } diff --git a/data/elementary/themes/edc/dialog.edc b/data/elementary/themes/edc/dialog.edc index 907aca29f5..01c4119f52 100644 --- a/data/elementary/themes/edc/dialog.edc +++ b/data/elementary/themes/edc/dialog.edc @@ -1,51 +1,42 @@ group { name: "e/widgets/dialog/main"; - images.image: "bevel_dark_out.png" COMP; - images.image: "separator_horiz.png" COMP; parts { part { name: "base"; type: RECT; description { state: "default" 0.0; - color_class: "dialog_base"; color: 64 64 64 255; } } - part { name: "bevel"; + part { name: "separator"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - image.normal: "bevel_dark_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } - part { name: "separator"; mouse_events: 0; - description { state: "default" 0.0; - min: 16 2; - max: 99999 2; + min: 16 1; + max: 99999 1; rel1.relative: 0.0 1.0; rel1.offset: 0 0; rel1.to_y: "e.swallow.content"; rel2.relative: 1.0 0.0; rel2.offset: -1 -1; rel2.to_y: "e.swallow.buttons"; - image.normal: "separator_horiz.png"; - fill.smooth: 0; + color: 72 72 72 255; fixed: 0 1; link.base: "e,state,buttons,on" "e"; + visible: 1; } desc { "hid"; hid; - image.normal: "separator_horiz.png"; + visible: 0; link.base: "e,state,buttons,off" "e"; } } part { name: "e.swallow.icon"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; align: 0.0 0.5; rel1.relative: 0.0 0.0; - rel1.offset: 4 4; + rel1.offset: 8 8; rel2.relative: 0.0 1.0; rel2.offset: -1 0; rel2.to_y: "button_spacer"; fixed: 1 0; visible: 0; + offscale; } description { state: "icon" 0.0; inherit: "default" 0.0; @@ -53,12 +44,14 @@ group { name: "e/widgets/dialog/main"; } } part { name: "e.swallow.content"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; - rel1.offset: 4 4; + rel1.offset: 8 8; rel1.to_x: "base"; rel2.to_x: "base"; - rel2.offset: -5 -1; + rel2.offset: -9 -1; rel2.to_y: "button_spacer"; + offscale; } description { state: "icon" 0.0; inherit: "default" 0.0; @@ -67,11 +60,13 @@ group { name: "e/widgets/dialog/main"; } } spacer { "button_spacer"; + scale: 1; desc { rel2.relative: 1.0 0.0; - rel2.offset: -5 -8; + rel2.offset: -9 -17; rel2.to_y: "e.swallow.buttons"; link.base: "e,state,buttons,on" "e"; + offscale; } desc { "hid"; link.base: "e,state,buttons,off" "e"; @@ -79,13 +74,15 @@ group { name: "e/widgets/dialog/main"; } } part { name: "e.swallow.buttons"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; align: 0.5 1.0; rel1.relative: 0.0 1.0; - rel1.offset: 4 -5; + rel1.offset: 8 -9; rel2.relative: 1.0 1.0; - rel2.offset: -5 -5; + rel2.offset: -9 -9; fixed: 0 1; + offscale; } desc { "hid"; hid; } } @@ -109,7 +106,7 @@ group { name: "e/widgets/dialog/main"; group { name: "e/widgets/dialog/text"; styles { style { name: "dialog_style"; - base: "font="FN" font_size=10 text_class=tb_plain align=center color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word"; + base: "font="FN" font_size=10 text_class=tb_plain align=center color=#a0a0a0 wrap=word"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD" text_class=tb_light"; } --
