rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=c94edc4c2233c4fac21f0cd5cf33f5517514bb90
commit c94edc4c2233c4fac21f0cd5cf33f5517514bb90 Author: Tetiana Naumenko <t.naume...@samsung.com> Date: Fri May 26 15:22:22 2017 +0300 theme: made window inwin/modal_window scalable Change-Id: I4aa74f3ce7fda25ede60ec4232975f8331ae3503 --- data/themes/default/widgets/inwin.edc | 91 +++++++++++++++++++++++++++++++---- 1 file changed, 81 insertions(+), 10 deletions(-) diff --git a/data/themes/default/widgets/inwin.edc b/data/themes/default/widgets/inwin.edc index ab8aa4cf4..8bdac7942 100644 --- a/data/themes/default/widgets/inwin.edc +++ b/data/themes/default/widgets/inwin.edc @@ -2,6 +2,7 @@ group { name: "elm/win/inwin/modal_window"; parts { part { name: "block_events"; type: RECT; + scale: 1; description { state: "default" 0.0; color: 0 0 0 0; } @@ -11,6 +12,7 @@ group { name: "elm/win/inwin/modal_window"; } part { name: "pop"; type: IMAGE; + scale: 1; description { state: "default" 0.0; image { normal: "popup-bg.png"; @@ -20,21 +22,61 @@ group { name: "elm/win/inwin/modal_window"; rel2.relative: 0.9 0.9; } } - part { name: "base"; + part { name: "top_left_base_space"; type: SPACER; + scale: 1; description { state: "default" 0.0; + min: 26 20; + max: 26 20; + align: 0.0 0.0; rel1 { - offset: 26 20; to: "pop"; } + } + } + part { name: "base"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + rel1 { + relative: 1.0 1.0; + to: "top_left_base_space"; + } + rel2 { + relative: 0.0 0.0; + to: "bottom_right_base_space"; + } + } + } + part { name: "bottom_right_base_space"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: 26 20; + max: 26 20; + align: 1.0 1.0; rel2 { - offset: -27 -21; to: "pop"; } } } + part { name: "left_text_space"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: 3 34; + max: 3 34; + align: 0.0 0.0; + rel1 { + relative: 1.0 0.0; + to_x: "elm.swallow.icon"; + to_y: "base"; + } + } + } part { name: "elm.text.title"; type: TEXT; + scale: 1; description { state: "default" 0.0; align: 0.5 0.0; fixed: 1 1; @@ -48,20 +90,31 @@ group { name: "elm/win/inwin/modal_window"; } rel1 { relative: 1.0 0.0; - offset: 3 0; - to_x: "elm.swallow.icon"; - to_y: "base"; + to: "left_text_space"; } rel2 { relative: 0.0 1.0; - offset: -4 -1; + to: "right_text_space"; + } + } + } + part { name: "right_text_space"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: 3 34; + max: 3 34; + align: 1.0 0.0; + rel1.to_y: "base"; + rel2 { + relative: 0.0 1.0; to_x: "elm.swallow.close"; - to_y: "base"; } } } part { name: "elm.swallow.icon"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; align: 0.0 0.5; fixed: 1 0; @@ -76,6 +129,7 @@ group { name: "elm/win/inwin/modal_window"; } part { name: "elm.swallow.close"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; align: 1.0 0.5; fixed: 1 1; @@ -108,6 +162,7 @@ group { name: "elm/win/inwin/modal_window"; } part { name: "elm.swallow.content"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; fixed: 1 0; rel1 { @@ -124,6 +179,7 @@ group { name: "elm/win/inwin/modal_window"; } part { name: "buttons.area"; type: SPACER; + scale: 1; description { state: "default" 0.0; align: 0.5 1.0; min: 0 34; @@ -150,6 +206,7 @@ group { name: "elm/win/inwin/modal_window"; } part { name: "eflete.swallow.btn_close"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; align: 1.0 0.5; fixed: 1 1; @@ -163,16 +220,30 @@ group { name: "elm/win/inwin/modal_window"; } } } + part { name: "buttons_space"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + min: 7 0; + max: 7 -1; + align: 1.0 1.0; + rel1.to: "eflete.swallow.btn_close"; + rel2 { + relative: 0.0 1.0; + to: "eflete.swallow.btn_close"; + } + } + } part { name: "eflete.swallow.btn_ok"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; align: 1.0 1.0; fixed: 1 1; rel1.to: "eflete.swallow.btn_close"; rel2 { relative: 0.0 1.0; - offset: -7 -1; - to: "eflete.swallow.btn_close"; + to: "buttons_space"; } } } --