[Genlist] Fix swallow part be above image part & image part name

Change-Id: Ib2c7c63466fa29cf9aa7861bb69b88617d0e8b1e

diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index 01658d1..7b45b74 100755 (executable)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -2161,12 +2161,12 @@
     program { \
       signal: "elm,state,rename,show"; \
       action: STATE_SET "default" 0.0; \
-      target: "elm.icon.rename"; \
+      target: "elm.image.rename"; \
    } \
    program { \
       signal: "elm,state,rename,hide"; \
       action: STATE_SET "hide" 0.0; \
-      target: "elm.icon.rename"; \
+      target: "elm.image.rename"; \
    }
 
 //****************************************************************************//

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index 93b760a..5de6f29 100755 (executable)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -88,36 +88,36 @@
                min: 0 48; // This is tuned value for exact entry size.
             )
          )
-         GENLIST_PART_ICON("elm.icon.eraser",
-            GENLIST_DESCRIPTION_RTB("elm.padding.right",
-               "elm.padding.top", "elm.padding.bottom",
+         GENLIST_PART_IMAGE("elm.image.rename",
+            GENLIST_DESCRIPTION_ENVELOP("elm.icon.eraser",
                fixed: 1 0;
-               visible: 0;
+               visible: 1;
+               image.normal: "00_EditField_rename.png";
                min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
                max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
+               color: GENLIST_ENTRY_RENAME_COLOR;
             )
-            description { state: "show" 0.0;
+            description { state: "hide" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
+               visible: 0;
             }
          )
-         GENLIST_PART_IMAGE("elm.icon.rename",
-            GENLIST_DESCRIPTION_ENVELOP("elm.icon.eraser",
+         GENLIST_PART_ICON("elm.icon.eraser",
+            GENLIST_DESCRIPTION_RTB("elm.padding.right",
+               "elm.padding.top", "elm.padding.bottom",
                fixed: 1 0;
-               visible: 1;
-               image.normal: "00_EditField_rename.png";
+               visible: 0;
                min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
                max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-               color: GENLIST_ENTRY_RENAME_COLOR;
             )
-            description { state: "hide" 0.0;
+            description { state: "show" 0.0;
                inherit: "default" 0.0;
-               visible: 0;
+               visible: 1;
             }
          )
          GENLIST_PART_FLIP
       }
-      GENLIST_PROGRAMS_NORMAL( target: "elm.icon.entry"; target: "elm.icon.rename"; )
+      GENLIST_PROGRAMS_NORMAL( target: "elm.icon.entry"; target: "elm.image.rename"; )
       GENLIST_PROGRAMS_ENTRY
    }
 
@@ -163,36 +163,36 @@
                min: 0 48; // This is tuned value for exact entry size.
             )
          )
-         GENLIST_PART_ICON("elm.icon.eraser",
-            GENLIST_DESCRIPTION_RTB("elm.padding.right",
-               "elm.text", "elm.padding.bottom",
+         GENLIST_PART_IMAGE("elm.image.rename",
+            GENLIST_DESCRIPTION_ENVELOP("elm.icon.eraser",
+               visible: 1;
                fixed: 1 0;
-               visible: 0;
+               image.normal: "00_EditField_rename.png";
                min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
                max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
+               color: GENLIST_ENTRY_RENAME_COLOR;
             )
-            description { state: "show" 0.0;
+            description { state: "hide" 0.0;
                inherit: "default" 0.0;
-               visible: 1;
+               visible: 0;
             }
          )
-         GENLIST_PART_IMAGE("elm.icon.rename",
-            GENLIST_DESCRIPTION_ENVELOP("elm.icon.eraser",
-               visible: 1;
+         GENLIST_PART_ICON("elm.icon.eraser",
+            GENLIST_DESCRIPTION_RTB("elm.padding.right",
+               "elm.text", "elm.padding.bottom",
                fixed: 1 0;
-               image.normal: "00_EditField_rename.png";
+               visible: 0;
                min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
                max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-               color: GENLIST_ENTRY_RENAME_COLOR;
             )
-            description { state: "hide" 0.0;
+            description { state: "show" 0.0;
                inherit: "default" 0.0;
-               visible: 0;
+               visible: 1;
             }
          )
          GENLIST_PART_FLIP
       }
-      GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.entry"; target: "elm.icon.rename"; )
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.entry"; target: "elm.image.rename"; )
       GENLIST_PROGRAMS_ENTRY
    }
 
@@ -2833,10 +2833,10 @@
       alias: "elm/layout/dialogue/editfield/default";
       inherit: "elm/genlist/item/editfield/default";
 
-      data.item: "contents" "elm.icon.entry elm.icon.rename elm.icon.eraser elm.icon.edit";
+      data.item: "contents" "elm.icon.entry elm.image.rename elm.icon.eraser elm.icon.edit";
 
       GENLIST_DIALOGUE_INHERIT_BODY( ; )
-      GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon.entry"; target: "elm.icon.rename"; target: "elm.icon.edit";)
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon.entry"; target: "elm.image.rename"; target: "elm.icon.edit";)
    }
 
 // 2.2.6.2 (Dialogue)
@@ -2844,10 +2844,10 @@
       alias: "elm/layout/dialogue/editfield/title/default";
       inherit: "elm/genlist/item/editfield/title/default";
 
-      data.item: "contents" "elm.icon.entry elm.icon.rename elm.icon.eraser elm.icon.edit";
+      data.item: "contents" "elm.icon.entry elm.image.rename elm.icon.eraser elm.icon.edit";
 
       GENLIST_DIALOGUE_INHERIT_BODY( ; )
-      GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon.entry"; target: "elm.icon.rename"; target: "elm.icon.edit";)
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon.entry"; target: "elm.image.rename"; target: "elm.icon.edit";)
    }
 
 // Dialogue Group Separators