[elm_dayselector.c]

[elm_pager.c]

diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index f87c451..d01910f 100644 (file)
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -166,14 +166,15 @@ elm_dayselector_add(Evas_Object *parent)
 
        //Frame
        wd->frame = elm_frame_add(obj);
-       elm_widget_resize_object_set(obj, wd->frame);
+       elm_object_style_set(wd->frame, "dayselector");
+       elm_widget_resize_object_set(obj, wd->frame); 
 
        //Base
        wd->base = edje_object_add(e);
        _elm_theme_object_set(obj, wd->base, "dayselector", "base", elm_widget_style_get(obj));
-       elm_widget_sub_object_add(obj, wd->base);
+       elm_object_style_set(wd->base, "dayselector");
        elm_frame_content_set(wd->frame, wd->base);
-
+       
        //Title
        wd->title = edje_object_add(e);
        elm_widget_sub_object_add(obj, wd->title);

diff --git a/src/lib/elm_pager.c b/src/lib/elm_pager.c
index 4a44289..70b585a 100644 (file)
--- a/src/lib/elm_pager.c
+++ b/src/lib/elm_pager.c
@@ -129,7 +129,7 @@ _eval_top(Evas_Object *obj)
        Evas_Coord w, y;
        Elm_Transit *transit;
 
-//     transit = elm_transit_add(obj);
+       transit = elm_transit_add(obj);
        evas_object_geometry_get( obj, NULL, &y, &w, NULL );
 
        if (wd->top)
@@ -140,10 +140,9 @@ _eval_top(Evas_Object *obj)
             if (wd->top->popme) pop = EINA_TRUE;
             if (ani) 
                {
-                 if (pop) evas_object_move( o, w, y );//elm_transit_fx_insert( transit, elm_fx_translation_add(o , 0, y, w, y));
-                 else evas_object_move(o, -w, y);//elm_transit_fx_insert( transit, elm_fx_translation_add(o , 0, y, -w, y));
-                 //elm_transit_completion_callback_set( transit, _complete_cb, it);
-                 _complete_cb( it );
+                 if (pop) elm_transit_fx_insert( transit, elm_fx_translation_add(o , 0, y, w, y));
+                 else elm_transit_fx_insert( transit, elm_fx_translation_add(o , 0, y, -w, y));
+                 elm_transit_completion_callback_set( transit, _complete_cb, it);
                }
             else 
                {
@@ -164,11 +163,11 @@ _eval_top(Evas_Object *obj)
        //add show/hide transition direction & animation on/off. 10.04.14 sohyun
        if (ani && o) 
          {
-           if (pop) evas_object_move(prev_o, 0, y );//elm_transit_fx_insert( transit, elm_fx_translation_add(prev_o, -w, y, 0, y));
-           else evas_object_move( prev_o, 0, y );//elm_transit_fx_insert( transit, elm_fx_translation_add(prev_o, w, y, 0, y));
-           //elm_transit_run( transit, 0.3 );
+           if (pop) elm_transit_fx_insert( transit, elm_fx_translation_add(prev_o, -w, y, 0, y));
+           else elm_transit_fx_insert( transit, elm_fx_translation_add(prev_o, w, y, 0, y));
+           elm_transit_run( transit, 0.3 );
          }
-       //elm_transit_del( transit ); 
+       elm_transit_del( transit ); 
 
        onshow = edje_object_data_get(prev_o, "onshow");
        if (onshow)
@@ -364,17 +363,13 @@ elm_pager_content_pop(Evas_Object *obj)
               {
                  Elm_Effect *transit;
                  Evas_Coord w, y;
-/*      
+      
                  transit = elm_transit_add(obj);
                  evas_object_geometry_get(obj, NULL, &y, &w, NULL);
                  elm_transit_fx_insert(transit, elm_fx_translation_add(o , 0, y, w, y));
                  elm_transit_completion_callback_set(transit, _complete_cb, it);
                  elm_transit_run(transit, 0.3 );
-                 elm_transit_del(transit);  */
-                 evas_object_move( o, w, y );
-                 _complete_cb( it );
-                 
-                 
+                 elm_transit_del(transit);  
                }
             else _signal_hide_finished(wd->top, o, "elm,action,hide,finished", "");