Fix password editfield to fit entry size

Change-Id: I5bb7484be8a5bfbb8e596f40f4188a81e69d22ff

diff --git a/ui-gadget/edc/custom_editfield.edc b/ui-gadget/edc/custom_editfield.edc
index fe4a699..7dfd297 100644 (file)
--- a/ui-gadget/edc/custom_editfield.edc
+++ b/ui-gadget/edc/custom_editfield.edc
@@ -6,14 +6,15 @@
 #define WPS_POPUP_SLIDER_VIEW_LAYOUT_SWALLOW_MIN_INC 266 10
 
 // Define macros for password editfield
-#define PASSWORD_EDITFIELD_BG_HEIGHT_INC 120
+#define PASSWORD_EDITFIELD_BG_HEIGHT_INC 10
 #define PASSWORD_EDITFIELD_PADDING_TOP_LEFT_MIN_INC 32 10
 #define PASSWORD_EDITFIELD_PADDING_BOTTOM_RIGHT_MIN_INC 56 10
 
 #define PASSWORD_EDITFIELD_PADDING_LINE_LEFT_MIN_INC 32 0
 #define PASSWORD_EDITFIELD_PADDING_LINE_RIGHT_MIN_INC 64 0
-#define PASSWORD_EDITFIELD_PADDING_LINE_BOTTOM_MIN_INC 0 24
-#define PASSWORD_EDITFIELD_LINE_RECT_MIN_INC 0 2
+
+#define PASSWORD_EDITFIELD_LINE_RECT_MIN_INC 0 1
+#PASSWORD_EDITFIED_LINE_PADDING_HEIGHT 0 4
 
 #define PASSWORD_EDITFIELD_PADDING_ELM_SWALLOW_CONTENT_MIN_INC 10 0
 #define PASSWORD_EDITFIELD_ELM_SWALLOW_CONTENT_ALIGN 0.5 0.5
@@ -671,15 +672,15 @@ group { "password";
             rel2.to: "bg";
          }
       }
-      spacer { "padding_line_bottom";
+      spacer { "line_padding";
          scale;
          desc { "default";
-            min: PASSWORD_EDITFIELD_PADDING_LINE_BOTTOM_MIN_INC;
-            fixed: 0 1;
-            align: 0.5 1.0;
-            rel1.to: "bg";
-            rel1.relative: 0.0 1.0;
-            rel2.to: "bg";
+            min: 0 PASSWORD_EDITFIED_LINE_PADDING_HEIGHT;
+            max: -1 PASSWORD_EDITFIED_LINE_PADDING_HEIGHT;
+            rel.to: "sizer_elm.swallow.content";
+            rel1.relative: 0 1;
+            rel2.relative: 1 1;
+            align: 0.5 0;
          }
       }
       rect { "line_rect";
@@ -688,15 +689,15 @@ group { "password";
          desc { "default";
             min: PASSWORD_EDITFIELD_LINE_RECT_MIN_INC;
             fixed: 1 1;
-            align: 0.5 1.0;
+            align: 0.5 0.0;
             rel1 {
                to_x: "padding_line_left";
-               to_y: "padding_line_bottom";
+               to_y: "line_padding";
                relative: 1.0 0.0;
             }
             rel2 {
                to_x: "padding_line_right";
-               to_y: "padding_line_bottom";
+               to_y: "line_padding";
                relative: 0.0 0.0;
             }
             color: 128 128 128 166;
@@ -813,7 +814,7 @@ group { "password";
             rel1 {
                                to_x: "padding_elm.swallow.content_left";
                                to_y: "bg";
-                               relative: 1.0 0.4;
+                               relative: 1.0 0.0;
             }
             rel2 {
                to: "padding_elm.swallow.content_right";