[editfield] the width is always fixed whether the clear button is shown or not

Change-Id: Iceb4b37e71b985887eeca288bc4ca2be35743bd3

diff --git a/themes/groups/editfield.edc b/themes/groups/editfield.edc
index 9378a34..fadb42f 100644 (file)
--- a/themes/groups/editfield.edc
+++ b/themes/groups/editfield.edc
@@ -205,17 +205,12 @@ group { name: "elm/editfield/base/default";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0;
+            min: EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 0;
             fixed: 1 1;
             align: 1 0;
             rel1.relative : 1.0 0.0;
             rel2.relative : 1.0 1.0;
          }
-         description {
-            state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            min: EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 0;
-         }
       }
       part {
          name: "right2";
@@ -567,7 +562,6 @@ group { name: "elm/editfield/base/default";
          signal: "elm,state,eraser,show";
          source: "elm";
          action: STATE_SET "elm.eraser.show" 0.0;
-         target: "right1";
          target: "eraser_image";
          target: "eraser";
       }
@@ -576,7 +570,6 @@ group { name: "elm/editfield/base/default";
          signal: "elm,state,eraser,hidden";
          source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "right1";
          target: "eraser_image";
          target: "eraser";
       }
@@ -819,17 +812,12 @@ group { name: "elm/editfield/base/searchbar";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 0;
+            min: EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 0;
             fixed: 1 1;
             align: 1 0;
             rel1.relative : 1.0 0.0;
             rel2.relative : 1.0 1.0;
          }
-         description {
-            state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            min: EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 0;
-         }
       }
       part {
          name: "right2";
@@ -1181,7 +1169,6 @@ group { name: "elm/editfield/base/searchbar";
          signal: "elm,state,eraser,show";
          source: "elm";
          action: STATE_SET "elm.eraser.show" 0.0;
-         target: "right1";
          target: "eraser_image";
          target: "eraser";
       }
@@ -1190,7 +1177,6 @@ group { name: "elm/editfield/base/searchbar";
          signal: "elm,state,eraser,hidden";
          source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "right1";
          target: "eraser_image";
          target: "eraser";
       }
@@ -1464,17 +1450,12 @@ group { name: "elm/editfield/base/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0;
+            min: EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 0;
             fixed: 1 1;
             align: 1 0;
             rel1.relative : 1.0 0.0;
             rel2.relative : 1.0 1.0;
          }
-         description {
-            state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            min: EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 0;
-         }
       }
       part {
          name: "right2";
@@ -1826,7 +1807,6 @@ group { name: "elm/editfield/base/font_color_black";
          signal: "elm,state,eraser,show";
          source: "elm";
          action: STATE_SET "elm.eraser.show" 0.0;
-         target: "right1";
          target: "eraser_image";
          target: "eraser";
       }
@@ -1835,7 +1815,6 @@ group { name: "elm/editfield/base/font_color_black";
          signal: "elm,state,eraser,hidden";
          source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "right1";
          target: "eraser_image";
          target: "eraser";
       }
@@ -2077,17 +2056,12 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          description {
             state: "default" 0.0;
             visible: 0;
-            min: EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 0;
+            min: EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 0;
             fixed: 1 1;
             align: 1 0;
             rel1.relative : 1.0 0.0;
             rel2.relative : 1.0 1.0;
          }
-         description {
-            state: "elm.eraser.show" 0.0;
-            inherit: "default" 0.0;
-            min: EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 0;
-         }
       }
       part {
          name: "right2";
@@ -2439,7 +2413,6 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          signal: "elm,state,eraser,show";
          source: "elm";
          action: STATE_SET "elm.eraser.show" 0.0;
-         target: "right1";
          target: "eraser_image";
          target: "eraser";
       }
@@ -2448,7 +2421,6 @@ group { name: "elm/editfield/base/searchbar/font_color_black";
          signal: "elm,state,eraser,hidden";
          source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "right1";
          target: "eraser_image";
          target: "eraser";
       }

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index a2138fa..ee99812 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -642,8 +642,7 @@
 #define EDITFIELD_DEFAULT_LEFT1_INC 0
 #define EDITFIELD_DEFAULT_LEFT2_INC 0
 #define EDITFIELD_DEFAULT_LEFT3_INC 1
-#define EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0
-#define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 60
+#define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 56
 #define EDITFIELD_DEFAULT_RIGHT2_INC 0
 #define EDITFIELD_DEFAULT_BOTTOM1_SINGLE_INC 20
 #define EDITFIELD_DEFAULT_BOTTOM1_MULTI_INC 5
@@ -657,8 +656,7 @@
 #define EDITFIELD_SEARCHBAR_LEFT1_INC 0
 #define EDITFIELD_SEARCHBAR_LEFT2_INC 0
 #define EDITFIELD_SEARCHBAR_LEFT3_INC 1
-#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 15
-#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 55
+#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 56
 #define EDITFIELD_SEARCHBAR_RIGHT2_INC 5
 #define EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC 8
 #define EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC 2

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index bee0276..40dc74c 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -627,8 +627,7 @@
 #define EDITFIELD_DEFAULT_LEFT1_INC 0
 #define EDITFIELD_DEFAULT_LEFT2_INC 0
 #define EDITFIELD_DEFAULT_LEFT3_INC 1
-#define EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0
-#define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 40
+#define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 35
 #define EDITFIELD_DEFAULT_RIGHT2_INC 0
 #define EDITFIELD_DEFAULT_BOTTOM1_SINGLE_INC 20
 #define EDITFIELD_DEFAULT_BOTTOM1_MULTI_INC 5
@@ -642,8 +641,7 @@
 #define EDITFIELD_SEARCHBAR_LEFT1_INC 0
 #define EDITFIELD_SEARCHBAR_LEFT2_INC 0
 #define EDITFIELD_SEARCHBAR_LEFT3_INC 1
-#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 15
-#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 45
+#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 35
 #define EDITFIELD_SEARCHBAR_RIGHT2_INC 5
 #define EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC 8
 #define EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC 2

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index a20e812..ac792a3 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -656,8 +656,7 @@
 #define EDITFIELD_DEFAULT_LEFT1_INC 0
 #define EDITFIELD_DEFAULT_LEFT2_INC 0
 #define EDITFIELD_DEFAULT_LEFT3_INC 1
-#define EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0
-#define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 60
+#define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 56
 #define EDITFIELD_DEFAULT_RIGHT2_INC 0
 #define EDITFIELD_DEFAULT_BOTTOM1_SINGLE_INC 20
 #define EDITFIELD_DEFAULT_BOTTOM1_MULTI_INC 5
@@ -671,8 +670,7 @@
 #define EDITFIELD_SEARCHBAR_LEFT1_INC 0
 #define EDITFIELD_SEARCHBAR_LEFT2_INC 0
 #define EDITFIELD_SEARCHBAR_LEFT3_INC 1
-#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 15
-#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 55
+#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 56
 #define EDITFIELD_SEARCHBAR_RIGHT2_INC 5
 #define EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC 8
 #define EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC 2

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index f8540c0..d3357ef 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -651,8 +651,7 @@
 #define EDITFIELD_DEFAULT_LEFT1_INC 0
 #define EDITFIELD_DEFAULT_LEFT2_INC 0
 #define EDITFIELD_DEFAULT_LEFT3_INC 1
-#define EDITFIELD_DEFAULT_RIGHT1_ERASER_HIDE_INC 0
-#define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 40
+#define EDITFIELD_DEFAULT_RIGHT1_ERASER_SHOW_INC 35
 #define EDITFIELD_DEFAULT_RIGHT2_INC 0
 #define EDITFIELD_DEFAULT_BOTTOM1_SINGLE_INC 20
 #define EDITFIELD_DEFAULT_BOTTOM1_MULTI_INC 5
@@ -666,8 +665,7 @@
 #define EDITFIELD_SEARCHBAR_LEFT1_INC 0
 #define EDITFIELD_SEARCHBAR_LEFT2_INC 0
 #define EDITFIELD_SEARCHBAR_LEFT3_INC 1
-#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_HIDE_INC 15
-#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 45
+#define EDITFIELD_SEARCHBAR_RIGHT1_ERASER_SHOW_INC 35
 #define EDITFIELD_SEARCHBAR_RIGHT2_INC 5
 #define EDITFIELD_SEARCHBAR_BOTTOM1_SINGLE_INC 8
 #define EDITFIELD_SEARCHBAR_BOTTOM1_MULTI_INC 2