[Genlist] Change button and group image by GUI 1.0

[platform/core/uifw/efl-theme-tizen.git] / themes / widgets / genlist / genlist_groupindex.edc

diff --git a/themes/widgets/genlist/genlist_groupindex.edc b/themes/widgets/genlist/genlist_groupindex.edc
index c6f5a39..946f467 100644 (file)
--- a/themes/widgets/genlist/genlist_groupindex.edc
+++ b/themes/widgets/genlist/genlist_groupindex.edc
@@ -48,18 +48,38 @@
       color: GENLIST_GROUPINDEX_LIST_FOCUS_COLOR; \
    }
 
-#define GENLIST_PART_INDEX_LINE(LEFT, RIGHT, TOP, BOTTOM) \
-         GENLIST_PART_RECT("index_line", \
-            GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \
-               color: GENLIST_GROUPINDEX_LINE_COLOR; \
-               min: 0 4; \
-               max: -1 4; \
-            ) \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               color: GENLIST_GROUPINDEX_LINE_FOCUS_COLOR; \
-            } \
-         )
+ #define GENLIST_DESCRIPTION_INDEX_LIST_TB \
+   description { state: "selected" 0.0; \
+      inherit: "default" 0.0; \
+      text.style: "genlist_style_groupindex_text_focus"; \
+   }
+
+#define GENLIST_PART_INDEX_LINE(TOP, BOTTOM) \
+      GENLIST_PART_RECT("index_line", \
+         GENLIST_DESCRIPTION_TB(TOP, BOTTOM, \
+            color: GENLIST_GROUPINDEX_LINE_COLOR; \
+            min: 0 4; \
+            max: -1 4; \
+         ) \
+         description { state: "selected" 0.0; \
+            inherit: "default" 0.0; \
+            color: GENLIST_GROUPINDEX_LINE_FOCUS_COLOR; \
+         } \
+      )
+
+#define GENLIST_PART_INDEX_LINE_ICON(LEFT, TOP, BOTTOM) \
+      GENLIST_PART_RECT("index_line_icon", \
+         GENLIST_DESCRIPTION_LTB(LEFT, TOP, BOTTOM, \
+            color: GENLIST_GROUPINDEX_LINE_COLOR; \
+            min: 0 4; \
+            max: -1 4; \
+            rel2.to_x: "base"; \
+         ) \
+         description { state: "selected" 0.0; \
+            inherit: "default" 0.0; \
+            color: GENLIST_GROUPINDEX_LINE_FOCUS_COLOR; \
+        } \
+      )
 
 // Group Index
 #define GENLIST_PARAM_INDEX_LIST \
@@ -81,7 +101,7 @@
    }
 
 #define GENLIST_PART_PADDING_GROUPINDEX_LEFT \
-         GENLIST_PART_EXPANDED_PAD \
+      GENLIST_PART_EXPANDED_PAD \
          GENLIST_PART_RECT("elm.padding.left", \
             GENLIST_DESCRIPTION_L("elm.swallow.pad",  \
                color: GENLIST_LIST_BG_COLOR; \
@@ -89,6 +109,14 @@
                max: GROUPINDEX_PADDING_SIZE_LEFT -1; \
                fixed: 1 0; \
             ) \
+            description { state: "selected" 0.0; \
+               inherit: "default" 0.0; \
+               color: GENLIST_GROUPINDEX_LIST_PRESS_COLOR; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               color: GENLIST_GROUPINDEX_LIST_BG_COLOR; \
+            } \
             GENLIST_DESCRIPTION_DECORATE_PADDING \
             GENLIST_DESCRIPTION_REORDER_PADDING \
             GENLIST_DESCRIPTION_DECORATE_REORDER_PADDING \
@@ -106,6 +134,14 @@
                rel2.to: "base"; \
                rel1.relative: 1 0; \
             } \
+            description { state: "selected" 0.0; \
+               inherit: "default" 0.0; \
+               color: GENLIST_GROUPINDEX_LIST_PRESS_COLOR; \
+            } \
+            description { state: "disabled" 0.0; \
+               inherit: "default" 0.0; \
+               color: GENLIST_GROUPINDEX_LIST_BG_COLOR; \
+            } \
             GENLIST_DESCRIPTION_DECORATE_PADDING \
             GENLIST_DESCRIPTION_REORDER_PADDING \
             GENLIST_DESCRIPTION_DECORATE_REORDER_PADDING \
@@ -153,7 +189,7 @@
             if (val == 0) {
                get_width();
                if (get_int(text_w) < get_int(org_text_w)) {
-                  set_int(end_timer, timer(0.5, "ender", 1));
+                  ender(1);
                   return;
                }
             }
@@ -192,9 +228,8 @@
                text.min: 1 1;
                align: 0 0;
             }
-            GENLIST_DESCRIPTION_INDEX_LIST
+            GENLIST_DESCRIPTION_INDEX_LIST_TB
          )
-         GENLIST_PART_INDEX_LINE("elm.padding.left", "elm.padding.right", "elm.text", "elm.padding.bottom")
          /*
          part { name: "dbg";
             type: TEXT;
@@ -210,6 +245,8 @@
          */
         GENLIST_PART_PADDING_GROUPINDEX_LEFT
         GENLIST_PART_PADDING_GROUPINDEX_RIGHT
+        GENLIST_PART_INDEX_LINE("elm.text", "elm.padding.bottom")
+        GENLIST_PART_FOCUS
       }
       program { name: "default";
          signal: "elm,state,default";
@@ -231,6 +268,8 @@
                   set_state(PART:"elm.text", "selected", 0.0);
                   set_state(PART:"index_line", "selected", 0.0);
                   set_state(PART:"bg", "selected", 0.0);
+                  set_state(PART:"elm.padding.left", "selected", 0.0);
+                  set_state(PART:"elm.padding.right", "selected", 0.0);
                }
             }
          }
@@ -242,6 +281,8 @@
                   set_state(PART:"elm.text", "default", 0.0);
                   set_state(PART:"index_line", "default", 0.0);
                   set_state(PART:"bg", "default", 0.0);
+                  set_state(PART:"elm.padding.left", "default", 0.0);
+                  set_state(PART:"elm.padding.right", "default", 0.0);
                }
             }
          }
@@ -252,9 +293,7 @@
                set_state(PART:"index_line", "default", 0.0);
                set_state(PART:"bg", "default", 0.0);
                if (!get_int(sliding_timer) && !get_int(end_timer)) {
-                  set_int(sliding_timer, timer(0.5, "sliding", 0));
-               } else {
-                  set_state(PART:"elm.text", "default", 0.0);
+                  set_int(sliding_timer, timer(0.01, "sliding", 0));
                }
             }
          }
@@ -262,9 +301,12 @@
             signal: "elm,state,slide,stop";
             source: "elm";
             script {
-               ender(0);
+               if (get_int(sliding_timer) && get_int(end_timer)) {
+                  ender(0);
+               }
             }
          }
+         GENLIST_PROGRAM_FOCUS
       }
    }
 
@@ -307,10 +349,12 @@
             )
             GENLIST_DESCRIPTION_INDEX_LIST
          )
-         GENLIST_PART_INDEX_LINE("elm.padding.icon.right", "elm.padding.right", "elm.text", "elm.padding.bottom")
+         GENLIST_PART_INDEX_LINE_ICON("elm.padding.icon.right", "elm.text", "elm.padding.bottom")
+         GENLIST_PART_FOCUS
       }
       programs {
-         GENLIST_PROGRAM_DISABLED( target: "elm.text"; target: "index_line"; )
-         GENLIST_PROGRAM_SELECT( target: "elm.text"; target: "index_line"; target: "bg"; )
+         GENLIST_PROGRAM_DISABLED( target: "elm.text"; target: "index_line_icon"; )
+         GENLIST_PROGRAM_SELECT( target: "elm.text"; target: "index_line_icon"; target: "bg"; )
+         GENLIST_PROGRAM_FOCUS
       }
    }