X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=themes%2Fwidgets%2Fgenlist%2Fgenlist_macro.edc;h=8703742962ff4c4b3967198ea86a2b27590dd3ac;hb=cf488993d972d7a5ce85a402ac4bfc846a44e964;hp=9d054d56f53300e77b882e80e80e89f072389da6;hpb=be9f35923ce23f8cb4b936e3df689cbbe120f187;p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git

diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index 9d054d5..8703742 100755
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -1900,27 +1900,22 @@
          }
 
 #define GENLIST_PROGRAM_BG_DIALOGUE \
-         program { name: "bg_default"; \
-            signal: "elm,state,default"; \
-            source: "*"; \
-            script { \
-               new st[31]; \
-               new Float:vl; \
-               get_state(PART:"2depth", st, 30, vl); \
-               if (!strcmp(st, "2depth")) \
-                  set_state(PART:"bg_dialogue", "2depth", 0.0); \
-               else \
-                  set_state(PART:"bg_dialogue", "default", 0.0); \
-            } \
-         } \
          program { name: "bg_top"; \
             signal: "elm,state,top"; \
             source: "*"; \
             script { \
                new st[31]; \
                new Float:vl; \
+               new st2[31]; \
+               new Float:vl2; \
                get_state(PART:"2depth", st, 30, vl); \
-               if (!strcmp(st, "2depth")) \
+               get_state(PART:"bg_dialogue", st2, 30, vl2); \
+               if (!strcmp(st2, "selected") || \
+                  !strcmp(st2, "top_selected") || \
+                  !strcmp(st2, "center_selected") ||  \
+                  !strcmp(st2, "bottom_selected")) \
+                  set_state(PART:"bg_dialogue", "top_selected", 0.0); \
+               else if (!strcmp(st, "2depth")) \
                   set_state(PART:"bg_dialogue", "2depth_top", 0.0); \
                else \
                   set_state(PART:"bg_dialogue", "top", 0.0); \
@@ -1932,8 +1927,16 @@
             script { \
                new st[31]; \
                new Float:vl; \
+               new st2[31]; \
+               new Float:vl2; \
                get_state(PART:"2depth", st, 30, vl); \
-               if (!strcmp(st, "2depth")) \
+               get_state(PART:"bg_dialogue", st2, 30, vl2); \
+               if (!strcmp(st2, "selected") || \
+                  !strcmp(st2, "top_selected") || \
+                  !strcmp(st2, "center_selected") ||  \
+                  !strcmp(st2, "bottom_selected")) \
+                  set_state(PART:"bg_dialogue", "center_selected", 0.0); \
+               else if (!strcmp(st, "2depth")) \
                   set_state(PART:"bg_dialogue", "2depth_center", 0.0); \
                else \
                   set_state(PART:"bg_dialogue", "center", 0.0); \
@@ -1945,8 +1948,16 @@
             script { \
                new st[31]; \
                new Float:vl; \
+               new st2[31]; \
+               new Float:vl2; \
                get_state(PART:"2depth", st, 30, vl); \
-               if (!strcmp(st, "2depth")) \
+               get_state(PART:"bg_dialogue", st2, 30, vl2); \
+               if (!strcmp(st2, "selected") || \
+                  !strcmp(st2, "top_selected") || \
+                  !strcmp(st2, "center_selected") ||  \
+                  !strcmp(st2, "bottom_selected")) \
+                  set_state(PART:"bg_dialogue", "bottom_selected", 0.0); \
+               else if (!strcmp(st, "2depth")) \
                   set_state(PART:"bg_dialogue", "2depth_bottom", 0.0); \
                else \
                   set_state(PART:"bg_dialogue", "bottom", 0.0); \
@@ -2048,6 +2059,36 @@
                   set_state(PART:"arrow_clip", "expand_opened", 0.0); \
                } \
             } \
+         } \
+         program { name: "selected_arrow_shadow"; \
+            signal: "elm,state,selected"; \
+            source: "elm"; \
+            script { \
+               new st[31]; \
+               new Float:vl; \
+               get_state(PART:"arrow_shadow_clip", st, 30, vl); \
+               if (!strcmp(st, "default")) { \
+                  set_state(PART:"arrow_shadow_clip", "default_press", 0.0); \
+               } \
+               else if (!strcmp(st, "expand_opened")) { \
+                  set_state(PART:"arrow_shadow_clip", "expand_opened_press", 0.0); \
+               } \
+            } \
+         } \
+         program { name: "unselected_arrow_shadow"; \
+            signal: "elm,state,unselected"; \
+            source: "elm"; \
+            script { \
+               new st[31]; \
+               new Float:vl; \
+               get_state(PART:"arrow_shadow_clip", st, 30, vl); \
+               if (!strcmp(st, "default_press")) { \
+                  set_state(PART:"arrow_shadow_clip", "default", 0.0); \
+               } \
+               else if (!strcmp(st, "expand_opened_press")) { \
+                  set_state(PART:"arrow_shadow_clip", "expand_opened", 0.0); \
+               } \
+            } \
          }
 
 #define GENLIST_PROGRAM_DECORATE( TARGET ) \
@@ -2622,12 +2663,22 @@
             image.border_scale: 1;
 
 /*****************************************************************************/
+/******************************* Genlist Proxy ********************************/
+/*****************************************************************************/
+#define GENLIST_PART_PROXY(NAME, DESCRIPION) \
+   part { name: NAME; \
+      scale: 1; \
+      type: PROXY; \
+      DESCRIPION \
+   }
+
+/*****************************************************************************/
 /******************************* Genlist Bubble ********************************/
 /*****************************************************************************/
 #define GENLIST_IMAGES_EXPANDABLE_BTN \
          images { \
-            image: "00_button_expand_closed.png" COMP; \
-            image: "00_button_expand_opened.png" COMP; \
+            image: "00_list_button_expand_closed.png" COMP; \
+            image: "00_list_button_expand_opened.png" COMP; \
          }
 
 #define GENLIST_PART_EXPANDABLE_ARROW \
@@ -2637,7 +2688,7 @@
          ) \
          GENLIST_PART_RECT("arrow_clip", \
             GENLIST_DESCRIPTION_ENVELOP("arrow", \
-               color: GENLIST_EXPANDABLE_ARROW_CLIP_COLOR; \
+               color: GENLIST_EXPANDABLE_ARROW_NORMAL_COLOR; \
             ) \
             description { state: "disabled" 0.0; \
                color: GENLIST_EXPANDABLE_ARROW_DIM_COLOR; \
@@ -2649,29 +2700,56 @@
                color: GENLIST_EXPANDABLE_ARROW_PRESS_COLOR; \
             } \
          ) \
+         GENLIST_PART_RECT("arrow_shadow_clip", \
+            GENLIST_DESCRIPTION_ENVELOP("arrow_shadow", \
+               color: GENLIST_EXPANDABLE_ARROW_SHADOW_NORMAL_COLOR; \
+            ) \
+            description { state: "disabled" 0.0; \
+               color: GENLIST_EXPANDABLE_ARROW_SHADOW_DIM_COLOR; \
+            } \
+            description { state: "expand_opened_press" 0.0; \
+               color: GENLIST_EXPANDABLE_ARROW_SHADOW_PRESS_COLOR; \
+               visible: 0; \
+            } \
+            description { state: "default_press" 0.0; \
+               color: GENLIST_EXPANDABLE_ARROW_SHADOW_PRESS_COLOR; \
+               visible: 0; \
+            } \
+         ) \
+         GENLIST_PART_PROXY("arrow_shadow", \
+            clip_to: "arrow_shadow_clip"; \
+            ignore_flags: ON_HOLD; \
+            mouse_events: 0; \
+            description { state : "default" 0.0; \
+               source: "arrow"; \
+               rel1.to: "arrow"; \
+               rel1.offset: 0 2; \
+               rel2.to: "arrow"; \
+               rel2.offset: 0 2; \
+            } \
+         ) \
          GENLIST_PART_IMAGE("arrow", \
             clip_to: "arrow_clip"; \
             ignore_flags: ON_HOLD; \
             mouse_events: 0; \
             GENLIST_DESCRIPTION_R("elm.padding.right", \
                fixed: 1 1; \
-               min: 45 45; \
-               max: 45 45; \
-               image.normal: "00_button_expand_closed.png"; \
+               min: GENLIST_BTN_02_SIZE GENLIST_BTN_02_SIZE; \
+               max: GENLIST_BTN_02_SIZE GENLIST_BTN_02_SIZE; \
+               image.normal: "00_list_button_expand_closed.png"; \
             ) \
             description { state: "default_press" 0.0; \
                inherit: "default" 0.0; \
-               image.normal: "00_button_expand_closed_press.png"; \
             } \
             description { state: "expand_opened" 0.0; \
                inherit: "default" 0.0; \
-               image.normal: "00_button_expand_opened.png"; \
+               image.normal: "00_list_button_expand_opened.png"; \
             } \
             description { state: "expand_opened_press" 0.0; \
                inherit: "expand_opened" 0.0; \
-               image.normal: "00_button_expand_opened_press.png"; \
             } \
          )
+
 /*****************************************************************************/
 /******************************* Genlist RECT ********************************/
 /*****************************************************************************/