Merge "iot common: Adjust padding of password popup" into tizen

diff --git a/ui-gadget/edc/custom_editfield.edc b/ui-gadget/edc/custom_editfield.edc
index 5a294ec..2bc9f86 100644 (file)
--- a/ui-gadget/edc/custom_editfield.edc
+++ b/ui-gadget/edc/custom_editfield.edc
@@ -7,11 +7,12 @@
 
 // Define macros for password editfield
 #define PASSWORD_EDITFIELD_BG_HEIGHT_INC 120
-#define PASSWORD_EDITFIELD_PADDING_MIN_INC 32 33
+#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 20
+#define PASSWORD_EDITFIELD_PADDING_LINE_BOTTOM_MIN_INC 0 24
 #define PASSWORD_EDITFIELD_LINE_RECT_MIN_INC 0 2
 
 #define PASSWORD_EDITFIELD_PADDING_ELM_SWALLOW_CONTENT_MIN_INC 10 0
@@ -644,7 +645,7 @@ group { "password";
       spacer { "padding_top_left";
          scale;
          desc { "default";
-            min: PASSWORD_EDITFIELD_PADDING_MIN_INC;
+            min: PASSWORD_EDITFIELD_PADDING_TOP_LEFT_MIN_INC;
             fixed: 1 1;
             align: 0.0 0.0;
             rel1.to: "bg";
@@ -655,7 +656,7 @@ group { "password";
       spacer { "padding_bottom_right";
          scale;
          desc { "default";
-            min: PASSWORD_EDITFIELD_PADDING_MIN_INC;
+            min: PASSWORD_EDITFIELD_PADDING_BOTTOM_RIGHT_MIN_INC;
             fixed: 1 1;
             align: 1.0 1.0;
             rel1.to: "bg";
@@ -825,8 +826,9 @@ group { "password";
          desc { "default";
             min: PASSWORD_EDITFIELD_ELM_SWALLOW_CONTENT_MIN_INC;
             rel1 {
-               to: "padding_elm.swallow.content_left";
-               relative: 1.0 0.0;
+                               to_x: "padding_elm.swallow.content_left";
+                               to_y: "bg";
+                               relative: 1.0 0.4;
             }
             rel2 {
                to: "padding_elm.swallow.content_right";