[entry] Fix a editfield_space which using by rename icon and clear button.

diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index 3de10a8..17a29ff 100644 (file)
--- a/themes/widgets/entry.edc
+++ b/themes/widgets/entry.edc
@@ -39,18 +39,38 @@
    part { name: "editfield_space"; \
       type: SPACER; \
       description { state: "default" 0.0; \
+         align: 1.0 0.5; \
          min: 0 0; \
          max: 0 0; \
          rel1.relative: 1.0 0.0; \
          rel2.relative: 1.0 1.0; \
       } \
-      description { state: "editfield" 0.0; \
+      description { state: "rename_visible" 0.0; \
          inherit: "default" 0.0; \
-         align: 1.0 0.5; \
-         fixed: 1 1; \
-         min: 70 60; \
-         max: 70 60; \
+         min: 5 0; \
+         max: 5 0; \
+         rel1 { \
+            to_x: "elm.swallow.rename"; \
+            relative: 0.0 0.0; \
          } \
+         rel2 { \
+            to_x: "elm.swallow.rename"; \
+            relative: 0.0 1.0; \
+         } \
+      } \
+      description { state: "clear_visible" 0.0; \
+         inherit: "default" 0.0; \
+         min: 5 0; \
+         max: 5 0; \
+         rel1 { \
+            to_x: "elm.swallow.clear"; \
+            relative: 0.0 0.0; \
+         } \
+         rel2 { \
+            to_x: "elm.swallow.clear"; \
+            relative: 0.0 1.0; \
+         } \
+      } \
    } \
    part { name: "elm.swallow.clear"; \
       type: SWALLOW; \
@@ -104,7 +124,7 @@
          v = get_int(scroll_enabled); \
          if (!v) { \
             set_state(PART:"elm.swallow.clear", "visible", 0.0); \
-            set_state(PART:"editfield_space", "editfield", 0.0); \
+            set_state(PART:"editfield_space", "clear_visible", 0.0); \
          } \
       } \
    } \
@@ -128,7 +148,7 @@
          v = get_int(scroll_enabled); \
          if (!v) { \
             set_state(PART:"elm.swallow.rename", "visible", 0.0); \
-            set_state(PART:"editfield_space", "editfield", 0.0); \
+            set_state(PART:"editfield_space", "rename_visible", 0.0); \
          } \
       } \
    } \
@@ -5234,22 +5254,36 @@ group { name: "elm/scroller/entry/default";
          part { name: "editfield_space";
             type: SPACER;
             description { state: "default" 0.0;
+               align: 1.0 1.0;
                rel1.to: "elm.swallow.end";
                rel1.relative: 0.0 0.0;
                rel2.to: "elm.swallow.end";
                rel2.relative: 1.0 1.0;
             }
-            description { state: "editfield" 0.0;
+            description { state: "rename_visible" 0.0;
+               inherit: "default" 0.0;
+               min: 5 0;
+               max: 5 0;
+               rel1 {
+                  to_x: "elm.swallow.rename";
+                  relative: 0.0 0.0;
+               }
+               rel2 {
+                  to_x: "elm.swallow.rename";
+                  relative: 0.0 1.0;
+               }
+            }
+            description { state: "clear_visible" 0.0;
+               inherit: "default" 0.0;
                align: 1.0 1.0;
-               fixed: 1 1;
-               min: 70 60;
-               max: 70 60;
+               min: 5 0;
+               max: 5 0;
                rel1 {
-                  to_x: "elm.swallow.end";
+                  to_x: "elm.swallow.clear";
                   relative: 0.0 0.0;
                }
                rel2 {
-                  to_x: "elm.swallow.end";
+                  to_x: "elm.swallow.clear";
                   relative: 0.0 1.0;
                }
             }
@@ -5311,7 +5345,7 @@ group { name: "elm/scroller/entry/default";
                }
                visible: 0;
             }
-            description { state: "visible" 0.0;
+            description { state: "clear_visible" 0.0;
                inherit: "default" 0.0;
                align: 1.0 1.0;
                visible: 1;
@@ -5335,7 +5369,7 @@ group { name: "elm/scroller/entry/default";
                }
                visible: 0;
             }
-            description { state: "visible" 0.0;
+            description { state: "rename_visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
@@ -5534,37 +5568,29 @@ group { name: "elm/scroller/entry/default";
          program { name: "clear_show";
             signal: "elm,state,clear,visible";
             source: "*";
-            action: STATE_SET "visible" 0.0;
+            action: STATE_SET "clear_visible" 0.0;
             target: "elm.swallow.clear";
-            after: "editfield_set";
+            target: "editfield_space";
          }
          program { name: "clear_hide";
             signal: "elm,state,clear,hidden";
             source: "*";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.clear";
-            after: "editfield_unset";
+            target: "editfield_space";
          }
          program { name: "rename_show";
             signal: "elm,state,rename,visible";
             source: "*";
-            action: STATE_SET "visible" 0.0;
+            action: STATE_SET "rename_visible" 0.0;
             target: "elm.swallow.rename";
-            after: "editfield_set";
+            target: "editfield_space";
          }
          program { name: "rename_hide";
             signal: "elm,state,rename,hidden";
             source: "*";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.rename";
-            after: "editfield_unset";
-         }
-         program { name: "editfield_set";
-            action: STATE_SET "editfield" 0.0;
-            target: "editfield_space";
-         }
-         program { name: "editfield_unset";
-            action: STATE_SET "default" 0.0;
             target: "editfield_space";
          }
          program { name: "end_show";