[genlist] selected text overlap bugfix 2text.1icon, 3text.1icon.2

Change-Id: I467d0487dca2f36f17bc52498b7fe1b528b4e8c2

diff --git a/themes/groups/genlist/genlist_macro.edc b/themes/groups/genlist/genlist_macro.edc
index eb58950..6dae1b6 100644 (file)
--- a/themes/groups/genlist/genlist_macro.edc
+++ b/themes/groups/genlist/genlist_macro.edc
@@ -565,6 +565,40 @@
                   set_state(PART:"elm.text", "selected", 0.0); \
             }
 
+#define GENLIST_PROGRAM_SCRIPT_RENAME_SELECT_2TEXT \
+            script { \
+               new st[31]; \
+               new Float:vl; \
+               get_state(PART:"elm.text.1", st, 30, vl); \
+               set_state(PART:"bg_image", "selected", 0.0); \
+               if (!strcmp(st, "rename_enabled")) { \
+                  set_state(PART:"elm.text.1", "selected", 1.0); \
+                  set_state(PART:"elm.text.2", "selected", 1.0); \
+               } \
+               else { \
+                  set_state(PART:"elm.text.1", "selected", 0.0); \
+                  set_state(PART:"elm.text.2", "selected", 0.0); \
+               } \
+            }
+
+#define GENLIST_PROGRAM_SCRIPT_RENAME_SELECT_3TEXT \
+            script { \
+               new st[31]; \
+               new Float:vl; \
+               get_state(PART:"elm.text.1", st, 30, vl); \
+               set_state(PART:"bg_image", "selected", 0.0); \
+               if (!strcmp(st, "rename_enabled")) { \
+                  set_state(PART:"elm.text.1", "selected", 1.0); \
+                  set_state(PART:"elm.text.2", "selected", 1.0); \
+                  set_state(PART:"elm.text.3", "selected", 1.0); \
+               } \
+               else { \
+                  set_state(PART:"elm.text.1", "selected", 0.0); \
+                  set_state(PART:"elm.text.2", "selected", 0.0); \
+                  set_state(PART:"elm.text.3", "selected", 0.0); \
+               } \
+            }
+
 #define GENLIST_PROGRAM_RENAME_1TEXT \
          program { name: "rename_enabled"; \
             signal: "elm,state,rename,enabled"; \

diff --git a/themes/groups/genlist/genlist_normal.edc b/themes/groups/genlist/genlist_normal.edc
index e66810e..6faa7c7 100644 (file)
--- a/themes/groups/genlist/genlist_normal.edc
+++ b/themes/groups/genlist/genlist_normal.edc
@@ -1476,6 +1476,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.text2.left";
@@ -1522,6 +1523,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          GENLIST_PART_RENAME
@@ -1531,10 +1533,7 @@
          program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
+            GENLIST_PROGRAM_SCRIPT_RENAME_SELECT_2TEXT
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
@@ -5510,6 +5509,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.text3.left";
@@ -5558,6 +5558,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
@@ -5588,6 +5589,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          GENLIST_PART_RENAME
@@ -5602,11 +5604,7 @@
          program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            target: "elm.text.3";
+            GENLIST_PROGRAM_SCRIPT_RENAME_SELECT_3TEXT
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";