From ee5b1c3c4a668166cba80b2fc41080ec4bf737eb Mon Sep 17 00:00:00 2001 From: Bartlomiej Uliasz Date: Wed, 24 Feb 2016 13:32:43 +0100 Subject: [PATCH] button.edc: Fixed settings cut strings on tab menu buttons Change-Id: Ibb0bbcbf9f3b13582821305a2ee0e3622cfc18ba Signed-off-by: Bartlomiej Uliasz --- res/widget/button.edc | 66 ++++++++++++++++----------------------------------- 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/res/widget/button.edc b/res/widget/button.edc index 1ee1cbf..3791298 100644 --- a/res/widget/button.edc +++ b/res/widget/button.edc @@ -44,57 +44,36 @@ group { } part { - name, "part.bg.left"; - type, RECT; + name, "padding.text.left"; + type, SPACER; scale, 1; description { state, "default" 0.0; - min, 40 82; + min, 20 0; rel1.to, "part.bg"; rel2 { - relative, 0.0 0.0; to, "part.bg"; + relative, 0.0 1.0; } - align, 1.0 0.0; - fixed, 1 1; - } - description { - state, "selected" 0.0; - inherit, "default" 0.0; - } - description { - state, "focused" 0.0; - inherit, "default" 0.0; - color, 0 119 246 255; + align, 0.0 0.5; + fixed, 1 0; } } part { - name, "part.bg.right"; - type, RECT; + name, "padding.text.right"; + type, SPACER; scale, 1; description { state, "default" 0.0; - min, 40 82; + min, 20 0; rel1 { - relative, 1.0 0.0; to, "part.bg"; - } - rel2 { relative, 1.0 0.0; - to, "part.bg"; } - align, 0.0 0.0; - fixed, 1 1; - } - description { - state, "selected" 0.0; - inherit, "default" 0.0; - } - description { - state, "focused" 0.0; - inherit, "default" 0.0; - color, 0 119 246 255; + rel2.to, "part.bg"; + align, 1.0 0.5; + fixed, 1 0; } } @@ -105,15 +84,20 @@ group { description { state, "default" 0.0; color, 104 104 104 255; - min, 0 82; - align, 0.5 0.0; - fixed, 0 1; + rel1 { + to, "padding.text.left"; + relative, 1.0 0.0; + } + rel2 { + to, "padding.text.right"; + relative, 0.0 1.0; + } text { min, 1 1; font, FONT_REGULAR; size, 32; align, 0.5 0.5; - ellipsis, 1.0; + ellipsis, -1; } } description { @@ -179,8 +163,6 @@ group { state = get_int(cur_state); if (state == STATE_SELECTED) { set_state(PART:"part.bg", "selected", 0.0); - set_state(PART:"part.bg.left", "selected", 0.0); - set_state(PART:"part.bg.right", "selected", 0.0); set_state(PART:"elm.text", "selected", 0.0); set_state(PART:"part.bottom.line", "selected", 0.0); } else { @@ -193,8 +175,6 @@ group { name, "focused,anim"; action, STATE_SET "focused" 0.0; target, "part.bg"; - target, "part.bg.left"; - target, "part.bg.right"; target, "elm.text"; target, "part.bottom.line"; transition, TRANSITION_FOCUS; @@ -204,8 +184,6 @@ group { name, "unfocused,anim"; action, STATE_SET "default" 0.0; target, "part.bg"; - target, "part.bg.left"; - target, "part.bg.right"; target, "elm.text"; target, "part.bottom.line"; transition, TRANSITION_FOCUS; @@ -218,8 +196,6 @@ group { script { set_int(cur_state, STATE_SELECTED); set_state(PART:"part.bg", "selected", 0.0); - set_state(PART:"part.bg.left", "selected", 0.0); - set_state(PART:"part.bg.right", "selected", 0.0); set_state(PART:"elm.text", "selected", 0.0); set_state(PART:"part.bottom.line", "selected", 0.0); } -- 2.7.4