[Genlist] add textblock style in 2text.1icon and dialogue/2text.1icon.6

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

diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index e09f491..b965659 100755 (executable)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -2059,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 ) \
@@ -2633,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 \
@@ -2648,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; \
@@ -2660,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 ********************************/
 /*****************************************************************************/
@@ -3118,6 +3185,17 @@
       GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS \
    )
 
+#define GENLIST_PART_SUBITEM_R_TB(NAME, HEIGHT, RIGHT) \
+   GENLIST_PART_TEXTBLOCK(NAME, \
+      GENLIST_DESCRIPTION_RTB(RIGHT, "elm.padding.top", "elm.padding.bottom", \
+         min: 0 HEIGHT; \
+         fixed: 1 0; \
+         GENLIST_PARAM_TEXT_LIMIT_RB \
+         GENLIST_PARAM_SUBITEM_DEFAULT_TB \
+      ) \
+      GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB \
+   )
+
 #define GENLIST_PART_SUBITEM_RB(NAME, HEIGHT, RIGHT, BOTTOM) \
    GENLIST_PART_TEXT(NAME, \
       GENLIST_DESCRIPTION_RB(RIGHT, BOTTOM, \