[entry] Remove All of rename swallow parts according dark theme GUI

Change-Id: I1d1ca4313c6278045f6339b24da615078288d905

diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc
index fb57d33..8504f6f 100644 (file)
--- a/themes/widgets/entry.edc
+++ b/themes/widgets/entry.edc
@@ -44,7 +44,7 @@
       relative: 1.0 0.0; \
    } \
    rel2 { \
-      to_x: "editfield_space"; \
+      to_x: "clear_padding"; \
       relative: 0.0 1.0; \
    }
 
@@ -54,13 +54,14 @@
    }
 
 #define ENTRY_SWALLOW_PARTS \
-   part { name: "editfield_space"; \
+   part { name: "clear_padding"; \
       type: SPACER; \
       scale: 1; \
       description { state: "default" 0.0; \
          align: 1.0 0.5; \
          min: 0 0; \
          max: 0 0; \
+         fixed: 1 0; \
          rel1 { \
             to_x: "focus_right_padding"; \
             relative: 0.0 0.0; \
@@ -70,55 +71,13 @@
             relative: 0.0 1.0; \
          } \
       } \
-      description { state: "rename_visible" 0.0; \
-         inherit: "default" 0.0; \
-         min: 9 0; \
-         max: 9 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: 9 0; \
-         max: 9 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; \
-      scale: 1; \
-      description { state: "default" 0.0; \
-         align: 1.0 0.5; \
-         fixed: 1 1; \
-         rel1 { \
-            to_x: "focus_right_padding"; \
-            relative: 0.0 0.0; \
-         } \
-         rel2 { \
-            to_x: "focus_right_padding"; \
-            relative: 0.0 1.0; \
-         } \
-         visible: 0; \
-      } \
       description { state: "visible" 0.0; \
          inherit: "default" 0.0; \
-         visible: 1; \
+         min: 70 0; \
+         max: 70 0; \
       } \
    } \
-   part { name: "elm.swallow.rename"; \
+   part { name: "elm.swallow.clear"; \
       type: SWALLOW; \
       scale: 1; \
       description { state: "default" 0.0; \
@@ -154,10 +113,10 @@
       type: SPACER; \
       scale: 1; \
       description { state: "default" 0.0; \
+         align: 0.0 0.5; \
          min: 10 0; \
          max: 10 0; \
          fixed: 1 0; \
-         align: 0.0 0.5; \
          rel1 { \
             to_x: "focus_bg"; \
             relative: 0.0 0.0; \
@@ -177,9 +136,9 @@
       type: SPACER; \
       scale: 1; \
       description { state: "default" 0.0; \
+         align: 1.0 0.5; \
          min: 10 0; \
          max: 10 0; \
-         align: 1.0 0.5; \
          fixed: 1 0; \
          rel1 { \
             to_x: "focus_bg"; \
@@ -342,7 +301,7 @@
          v = get_int(scroll_enabled); \
          if (!v) { \
             set_state(PART:"elm.swallow.clear", "visible", 0.0); \
-            set_state(PART:"editfield_space", "clear_visible", 0.0); \
+            set_state(PART:"clear_padding", "visible", 0.0); \
          } \
       } \
    } \
@@ -354,31 +313,7 @@
          v = get_int(scroll_enabled); \
          if (!v) { \
             set_state(PART:"elm.swallow.clear", "default", 0.0); \
-            set_state(PART:"editfield_space", "default", 0.0); \
-         } \
-      } \
-   } \
-   program { name: "rename_show"; \
-      signal: "elm,state,rename,visible"; \
-      source: "*"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"elm.swallow.rename", "visible", 0.0); \
-            set_state(PART:"editfield_space", "rename_visible", 0.0); \
-         } \
-      } \
-   } \
-   program { name: "rename_hide"; \
-      signal: "elm,state,rename,hidden"; \
-      source: "*"; \
-      script { \
-         new v; \
-         v = get_int(scroll_enabled); \
-         if (!v) { \
-            set_state(PART:"elm.swallow.rename", "default", 0.0); \
-            set_state(PART:"editfield_space", "default", 0.0); \
+            set_state(PART:"clear_padding", "default", 0.0); \
          } \
       } \
    }
@@ -5792,9 +5727,9 @@ group { name: "elm/scroller/entry/default";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
+               align: 0.0 0.5;
                min: 10 0;
                max: 10 0;
-               align: 0.0 0.5;
                fixed: 1 0;
                rel1 {
                   to: "focus_bg";
@@ -5810,9 +5745,9 @@ group { name: "elm/scroller/entry/default";
             type: SPACER;
             scale: 1;
             description { state: "default" 0.0;
+               align: 1.0 0.5;
                min: 10 0;
                max: 10 0;
-               align: 1.0 0.5;
                fixed: 1 0;
                rel1 {
                   to: "focus_bg";
@@ -5848,55 +5783,46 @@ group { name: "elm/scroller/entry/default";
                rel2.to: "bg";
             }
          }
-         part { name: "editfield_space";
-            type: SPACER;
+         part { name: "contentclipper";
+            type: RECT;
             scale: 1;
+            mouse_events: 0;
+            clip_to: "clipper";
             description { state: "default" 0.0;
-               align: 1.0 1.0;
-               min: 0 0;
-               max: 0 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: "rename_visible" 0.0;
-               inherit: "default" 0.0;
-               min: 9 0;
-               max: 9 0;
                rel1 {
-                  to_x: "elm.swallow.rename";
-                  relative: 0.0 0.0;
+                  to_x: "icon_padding";
+                  to_y: "bg";
+                  relative: 1.0 0.0;
                }
                rel2 {
-                  to_x: "elm.swallow.rename";
+                  to_x: "clear_padding";
+                  to_y: "bg";
                   relative: 0.0 1.0;
                }
             }
-            description { state: "clear_visible" 0.0;
-               inherit: "default" 0.0;
-               min: 9 0;
-               max: 9 0;
+         }
+         part { name: "icon_padding";
+            type: SPACER;
+            scale: 1;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               align: 0.0 0.5;
+               min: 0 0;
+               max: 0 0;
+               fixed: 1 1;
                rel1 {
-                  to_x: "elm.swallow.clear";
+                  to: "bg";
                   relative: 0.0 0.0;
                }
                rel2 {
-                  to_x: "elm.swallow.clear";
+                  to: "bg";
                   relative: 0.0 1.0;
                }
             }
-         }
-         part { name: "contentclipper";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               rel1.to: "icon_right_padding";
-               rel1.relative: 1.0 0.0;
-               rel2.to: "editfield_space";
-               rel2.relative: 0.0 1.0;
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               min: 70 0;
+               max: 70 0;
             }
          }
          part { name: "elm.swallow.icon";
@@ -5921,36 +5847,13 @@ group { name: "elm/scroller/entry/default";
                visible: 1;
             }
          }
-         part { name: "icon_right_padding";
+         part { name: "clear_padding";
             type: SPACER;
             scale: 1;
-            clip_to: "clipper";
             description { state: "default" 0.0;
-               fixed: 1 1;
-               align: 0.0 0.0;
+               align: 1.0 0.5;
                min: 0 0;
                max: 0 0;
-               rel1 {
-                  to_x: "elm.swallow.icon";
-                  relative: 1.0 0.0;
-               }
-               rel2 {
-                  to_x: "elm.swallow.icon";
-                  relative: 1.0 1.0;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               min: 8 0;
-               max: 8 0;
-            }
-         }
-         part { name: "elm.swallow.clear";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               align: 1.0 0.5;
                fixed: 1 1;
                rel1 {
                   to_x: "elm.swallow.end";
@@ -5962,14 +5865,14 @@ group { name: "elm/scroller/entry/default";
                   to_y: "bg";
                   relative: 0.0 1.0;
                }
-               visible: 0;
             }
-            description { state: "clear_visible" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
+               min: 70 0;
+               max: 70 0;
             }
          }
-         part { name: "elm.swallow.rename";
+         part { name: "elm.swallow.clear";
             type: SWALLOW;
             scale: 1;
             clip_to: "clipper";
@@ -5988,7 +5891,7 @@ group { name: "elm/scroller/entry/default";
                }
                visible: 0;
             }
-            description { state: "rename_visible" 0.0;
+            description { state: "visible" 0.0;
                inherit: "default" 0.0;
                visible: 1;
             }
@@ -6021,12 +5924,14 @@ group { name: "elm/scroller/entry/default";
             type: SWALLOW;
             description { state: "default" 0.0;
                rel1 {
-                       to_x: "icon_right_padding";
-                       relative: 1.0 0.0;
+                  to_x: "icon_padding";
+                  to_y: "bg";
+                  relative: 1.0 0.0;
                }
                rel2 {
-                to_x: "editfield_space";
-                relative: 0.0 1.0;
+                  to_x: "clear_padding";
+                  to_y: "bg";
+                  relative: 0.0 1.0;
                }
             }
          }
@@ -6065,12 +5970,12 @@ group { name: "elm/scroller/entry/default";
                rel1 {
                   relative: 0.0 0.0;
                   to_y:     "elm.swallow.content";
-                  to_x:     "editfield_space";
+                  to_x:     "clear_padding";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to_y:     "sb_hbar";
-                  to_x:     "editfield_space";
+                  to_x:     "clear_padding";
                }
             }
          }
@@ -6187,42 +6092,28 @@ group { name: "elm/scroller/entry/default";
             source: "elm";
             action: STATE_SET "visible" 0.0;
             target: "elm.swallow.icon";
-            target: "icon_right_padding";
+            target: "icon_padding";
          }
          program { name: "icon_hide";
             signal: "elm,action,hide,icon";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.icon";
-            target: "icon_right_padding";
+            target: "icon_padding";
          }
          program { name: "clear_show";
             signal: "elm,state,clear,visible";
             source: "*";
-            action: STATE_SET "clear_visible" 0.0;
+            action: STATE_SET "visible" 0.0;
             target: "elm.swallow.clear";
-            target: "editfield_space";
+            target: "clear_padding";
          }
          program { name: "clear_hide";
             signal: "elm,state,clear,hidden";
             source: "*";
             action: STATE_SET "default" 0.0;
             target: "elm.swallow.clear";
-            target: "editfield_space";
-         }
-         program { name: "rename_show";
-            signal: "elm,state,rename,visible";
-            source: "*";
-            action: STATE_SET "rename_visible" 0.0;
-            target: "elm.swallow.rename";
-            target: "editfield_space";
-         }
-         program { name: "rename_hide";
-            signal: "elm,state,rename,hidden";
-            source: "*";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.rename";
-            target: "editfield_space";
+            target: "clear_padding";
          }
          program { name: "end_show";
             signal: "elm,action,show,end";