[genlist_expandale_list.edc, genlist_macro.edc] add expandable flip effect

diff --git a/themes/groups/genlist/genlist_expandable_list.edc b/themes/groups/genlist/genlist_expandable_list.edc
index 1378d21..c86d998 100644 (file)
--- a/themes/groups/genlist/genlist_expandable_list.edc
+++ b/themes/groups/genlist/genlist_expandable_list.edc
@@ -44,7 +44,7 @@
       parts { \
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT() \
          GENLIST_EXPANDABLE_PART_BASE( 70, GE_COLOR ) \
-         BEAT_GENLIST_PART_BOTTOM_LINE \
+         BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE \
          BEAT_GENLIST_PART_PADDING_LEFT( 10 ) \
          BEAT_GENLIST_PART_PADDING_RIGHT( 10 ) \
          BEAT_GENLIST_PART_EXPANDABLE_SWALLOW_PADDING  \
@@ -231,6 +231,7 @@
             target: "elm.text"; \
             target: "arrow"; \
             target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
          } \
          program { \
             BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 ) \
@@ -238,6 +239,59 @@
             target: "elm.text"; \
             target: "arrow"; \
             target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
+         } \
+         program { \
+            BEAT_GENLIST_PROGRAM_MAP_END() \
+            target: "base"; \
+            target: "elm.text"; \
+            target: "arrow"; \
+            target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
+         } \
+         program { \
+            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2() \
+            target: "base"; \
+            target: "elm.text"; \
+            target: "arrow"; \
+            target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
+         } \
+         program { \
+            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 ) \
+            target: "base"; \
+            target: "elm.text"; \
+            target: "arrow"; \
+            target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
+         } \
+         program { \
+            BEAT_GENLIST_PROGRAM_MAP_END2() \
+            target: "base"; \
+            target: "elm.text"; \
+            target: "arrow"; \
+            target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
+         } \
+         program { \
+            name: "show"; \
+            signal: "elm,state,show"; \
+            action: STATE_SET "default" 0.0; \
+            target: "base"; \
+            target: "elm.text"; \
+            target: "arrow"; \
+            target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
+         } \
+         program { \
+            name: "hide"; \
+            signal: "elm,state,hide"; \
+            action: STATE_SET "hide" 0.0; \
+            target: "base"; \
+            target: "elm.text"; \
+            target: "arrow"; \
+            target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
          } \
       } \
    } 
@@ -257,7 +311,7 @@
       parts { \
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT() \
          GENLIST_EXPANDABLE_PART_BASE( 70, GE_COLOR ) \
-         BEAT_GENLIST_PART_BOTTOM_LINE \
+         BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE \
          BEAT_GENLIST_PART_PADDING_LEFT( 10 ) \
          BEAT_GENLIST_PART_PADDING_RIGHT( 10 ) \
          BEAT_GENLIST_PART_EXPANDABLE_SWALLOW_PADDING  \
@@ -340,12 +394,68 @@
             target: "base"; \
             target: "elm.text"; \
             target: "elm.swallow.pad"; \
+            target: "elm.swallow.end"; \
+            target: "bottom_line"; \
+         } \
+         program { \
+            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 ) \
+            target: "base"; \
+            target: "elm.text"; \
+            target: "elm.swallow.end"; \
+            target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
+         } \
+         program { \
+            BEAT_GENLIST_PROGRAM_MAP_END() \
+            target: "base"; \
+            target: "elm.text"; \
+            target: "elm.swallow.end"; \
+            target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
+         } \
+         program { \
+            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2() \
+            target: "base"; \
+            target: "elm.text"; \
+            target: "elm.swallow.end"; \
+            target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
+         } \
+         program { \
+            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 ) \
+            target: "base"; \
+            target: "elm.text"; \
+            target: "elm.swallow.end"; \
+            target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
+         } \
+         program { \
+            BEAT_GENLIST_PROGRAM_MAP_END2() \
+            target: "base"; \
+            target: "elm.text"; \
+            target: "elm.swallow.end"; \
+            target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
+         } \
+         program { \
+            name: "show"; \
+            signal: "elm,state,show"; \
+            action: STATE_SET "default" 0.0; \
+            target: "base"; \
+            target: "elm.text"; \
+            target: "elm.swallow.end"; \
+            target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0. ) \
+            name: "hide"; \
+            signal: "elm,state,hide"; \
+            action: STATE_SET "hide" 0.0; \
             target: "base"; \
             target: "elm.text"; \
+            target: "elm.swallow.end"; \
             target: "elm.swallow.pad"; \
+            target: "bottom_line"; \
          } \
       } \
    }

diff --git a/themes/groups/genlist/genlist_macro.edc b/themes/groups/genlist/genlist_macro.edc
index fd23051..202df27 100644 (file)
--- a/themes/groups/genlist/genlist_macro.edc
+++ b/themes/groups/genlist/genlist_macro.edc
@@ -96,6 +96,25 @@
             } \
          }
 
+#define BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE \
+         part { name: "bottom_line"; \
+            type: RECT; \
+            clip_to: "disclip"; \
+            mouse_events: 0; \
+            description { state: "default" 0.0; \
+               min: 0 1; \
+               fixed: 0 1; \
+               visible: 1; \
+               color: GENLIST_PART_BOTTOM_LINE_INC; \
+               rel1 { \
+                  relative: 0.0 1.0; \
+                  offset: 0 -1; \
+               } \
+            } \
+            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+         }
+
 #define BEAT_GENLIST_PART_PADDING_TOP( param_padding_size ) \
        part { name: "elm.padding.top"; \
             type: RECT; \
@@ -238,40 +257,68 @@
                part { name: "point"; \
                        type: RECT; \
                        scale: 1; \
-                       description { \
-                               state: "default" 0.0; \
-                               color: 0 0 0 0; \
-                               rel1 { relative: 0.0 0.0; } \
-                               rel2 { relative: 1.0 0.0; } \
-                       } \
-               }
+                        description { \
+                                state: "default" 0.0; \
+                                color: 0 0 0 0; \
+                                rel1 { relative: 0.0 0.0; } \
+                                rel2 { relative: 1.0 0.0; } \
+                        } \
+                }
 
 #define BEAT_GENLIST_PART_MAP_START( param_x, param_y, param_z ) \
                description { state: "map_transition" 0.0; \
-               inherit: "default" 0.0; \
-               map { \
-                               perspective: "point"; \
-                               on: 1; \
-                               smooth: 1; \
-                               perspective_on: 1; \
-                               backface_cull: 1; \
-                               rotation { \
-                                       center: "point"; \
-                                       x: param_x; \
-                                       y: param_y; \
-                                       z: param_z; \
-                               } \
-                       } \
-               }
-               
+                   inherit: "default" 0.0; \
+                   map { \
+                      perspective: "point"; \
+                      on: 1; \
+                      smooth: 1; \
+                      perspective_on: 1; \
+                      backface_cull: 1; \
+                      rotation { \
+                         center: "point"; \
+                         x: param_x; \
+                         y: param_y; \
+                         z: param_z; \
+                      } \
+                  } \
+                } \
+                description { \
+                        state: "hide" 0.0; \
+                        inherit: "default" 0.0; \
+                        visible: 0; \
+                }
+
 #define BEAT_GENLIST_PART_MAP_FINISH( param_x, param_y, param_z ) \
-               description { \
-                       state: "map_rotate" 0.0; \
-                       inherit: "default" 0.0; \
-                       map.rotation.x: param_x; \
-                       map.rotation.y: param_y; \
-                       map.rotation.z: param_z; \
-               }  
+                description { \
+                        state: "map_rotate" 0.0; \
+                        inherit: "default" 0.0; \
+                        map { \
+                                perspective: "point"; \
+                                on: 1; \
+                                smooth: 1; \
+                                perspective_on: 1; \
+                                backface_cull: 1; \
+                                rotation { \
+                                        center: "point"; \
+                                        x: param_x; \
+                                        y: param_y; \
+                                        z: param_z; \
+                                } \
+                       } \
+               } \
+
+#define BEAT_GENLIST_PART_MAP_BASE( param_item_height ) \
+         part { name: "base"; \
+            type: RECT; \
+            repeat_events: 1; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: 0 param_item_height; \
+               color: GENLIST_PART_BG_COLOR_INC; \
+            } \
+            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+         }
 
 #define GENLIST_EXPANDABLE_PART_BASE( GE_HEIGHT , GE_COLOR ) \
          part { name: "base"; \
@@ -291,15 +338,36 @@
          }
 
 #define BEAT_GENLIST_PROGRAM_MAP_ROTATE_START() \
-               name: "rotaion_transition"; \
-               signal: "flip_item"; \
-               action: STATE_SET "map_transition" 0.0; \
-               after: "rotation"; 
+                name: "rotaion_transition"; \
+                signal: "flip_item"; \
+                action: STATE_SET "map_transition" 0.0; \
+                after: "rotation";
 
 #define BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( second ) \
-               name: "rotation"; \
-               action: STATE_SET "map_rotate" 0.0; \
-               transition: LINEAR second; 
+                name: "rotation"; \
+                action: STATE_SET "map_rotate" 0.0; \
+                transition: LINEAR second; \
+                after: "rotation_end";
+
+#define BEAT_GENLIST_PROGRAM_MAP_END() \
+                name: "rotation_end"; \
+                action: STATE_SET "default" 0.0;
+
+#define BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2() \
+                name: "rotaion_transition2"; \
+                signal: "elm,state,contract_flip"; \
+                action: STATE_SET "map_rotate" 0.0; \
+                after: "rotation2";
+
+#define BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( second ) \
+                name: "rotation2"; \
+                action: STATE_SET "map_transition" 0.0; \
+                transition: LINEAR second; \
+                after: "rotation3";
+
+#define BEAT_GENLIST_PROGRAM_MAP_END2() \
+                name: "rotation3"; \
+                action: STATE_SET "hide" 0.0;
 
 #define BEAT_GENLIST_PART_EXPANDABLE2_NOSHADOW_BASE( param_item_height ) \
          part { name: "base"; \
@@ -440,4 +508,3 @@
                color: 0 0 0 0; \
             } \
          }
-