Fix FTBFS on efl-1.11

[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 24ba41d..4dd745d 100755 (executable)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -1862,11 +1862,8 @@
             new Float:vl; \
             get_state(PART:"base", st, 30, vl); \
             if (strcmp(st, "disabled")) \
-               run_program(PROGRAM:"play_button_press"SRC); \
+               play_sample("touch_sound", 1.0); \
          } \
-      } \
-      program { name: "play_button_press"SRC; \
-         action: PLAY_SAMPLE "touch_sound" 1.0; \
       }
 
 #define GENLIST_PROGRAM_REORDER_SOUND( SRC ) \
@@ -1965,7 +1962,7 @@
          }
 
 #define GENLIST_PROGRAM_SELECT_DIALOGUE( TARGET ) \
-         program { name: "selected"; \
+         program { name: "selected_dialog"; \
             signal: "elm,state,selected"; \
             source: "elm"; \
             script { \
@@ -1983,7 +1980,7 @@
                run_program(PROGRAM:"target_selected"); \
             } \
          } \
-         program { name: "unselected"; \
+         program { name: "unselected_dialog"; \
             signal: "elm,state,unselected"; \
             source: "elm"; \
             script { \
@@ -2321,6 +2318,7 @@
 #define GENLIST_PROGRAMS_NORMAL( TARGET ) \
    programs { \
       GENLIST_PROGRAM_DEFAULT( TARGET \
+         target: "base"; \
          target: "bg"; \
          target: "bg_clip"; \
          target: "bottom_line"; \
@@ -2358,6 +2356,7 @@
 #define GENLIST_PROGRAMS_DIALOGUE( TARGET ) \
    programs { \
       GENLIST_PROGRAM_DEFAULT( TARGET \
+         target: "base"; \
          target: "bg_dialogue"; \
          target: "elm.padding.left"; \
          target: "elm.padding.right"; \
@@ -2413,6 +2412,7 @@
 
 #define GENLIST_PROGRAMS_ENTRY( TARGET ) \
    GENLIST_PROGRAM_DEFAULT( TARGET \
+      target: "base"; \
       target: "bg"; \
       target: "bg_clip"; \
       target: "bottom_line"; \
@@ -2677,8 +2677,8 @@
 /*****************************************************************************/
 #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 \
@@ -2734,16 +2734,16 @@
             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; \
             } \
             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; \
@@ -3185,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, \
@@ -3650,5 +3661,21 @@
                color: GENLIST_LIST_BG_POPUP_COLOR; \
             } \
          ) \
+         GENLIST_PART_RECT("bottom_line", \
+            description { state: "default" 0.0; \
+               color: GENLIST_LIST_LINE1_POPUP_COLOR; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: GENLIST_LIST_LINE1_POPUP_COLOR; \
+            } \
+         ) \
+         GENLIST_PART_RECT("bottom_line2", \
+            description { state: "default" 0.0; \
+               color: GENLIST_LIST_LINE2_POPUP_COLOR; \
+            } \
+            description { state: "disabled" 0.0; \
+               color: GENLIST_LIST_LINE2_POPUP_COLOR; \
+            } \
+         ) \
       } \
    }