From: ChunEon Park Date: Mon, 11 Oct 2010 11:43:48 +0000 (+0900) Subject: [actionslider] X-Git-Tag: sbs-working-i386~145^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e5fc4fcac5dffce20775cee4b8b4e1d66b9f593;p=framework%2Fuifw%2Felementary.git [actionslider] [ctxpopup] [dayselector [slidingdrawer] [transit] --- diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c index acb1a1f..a42f16d 100644 --- a/src/lib/elm_actionslider.c +++ b/src/lib/elm_actionslider.c @@ -304,7 +304,7 @@ _icon_animation(void *data) /** * Add a new actionslider to the parent. * - * @param parent The parent object + * @param[in] parent The parent object * @return The new actionslider object or NULL if it cannot be created * * @ingroup Actionslider @@ -391,8 +391,8 @@ elm_actionslider_add_with_set(Evas_Object *parent, Elm_Actionslider_Icon_Pos pos /** * Set actionslider indicator position. * - * @param obj The actionslider object. - * @param pos The position of the indicator. + * @param[in] obj The actionslider object. + * @param[in] pos The position of the indicator. * (ELM_ACTIONSLIDER_INDICATOR_LEFT, ELM_ACTIONSLIDER_INDICATOR_RIGHT, * ELM_ACTIONSLIDER_INDICATOR_CENTER) * @@ -429,8 +429,8 @@ elm_actionslider_indicator_pos_set(Evas_Object *obj, Elm_Actionslider_Indicator_ /** * Set actionslider magnet position. * - * @param obj The actionslider object. - * @param pos The position of the magnet. + * @param[in] obj The actionslider object. + * @param[in] pos The position of the magnet. * (ELM_ACTIONSLIDER_MAGNET_LEFT, ELM_ACTIONSLIDER_MAGNET_RIGHT, * ELM_ACTIONSLIDER_MAGNET_BOTH, ELM_ACTIONSLIDER_MAGNET_CENTER) * @@ -447,8 +447,8 @@ elm_actionslider_magnet_pos_set(Evas_Object *obj, Elm_Actionslider_Magnet_Pos po /** * Set actionslider label. * - * @param obj The actionslider object - * @param pos The position of the label. + * @param[in] obj The actionslider object + * @param[in] pos The position of the label. * (ELM_ACTIONSLIDER_LABEL_LEFT, ELM_ACTIONSLIDER_LABEL_RIGHT) * @param label The label which is going to be set. * @@ -530,8 +530,8 @@ elm_actionslider_label_set(Evas_Object *obj, Elm_Actionslider_Label_Pos pos, con /** * Hold actionslider object movement. * - * @param obj The actionslider object - * @param flag Actionslider hold/release + * @param[in] obj The actionslider object + * @param[in] flag Actionslider hold/release * (EINA_TURE = hold/EIN_FALSE = release) * * @ingroup Actionslider diff --git a/src/lib/elm_animator.c b/src/lib/elm_animator.c index e3a758f..19bd8da 100644 --- a/src/lib/elm_animator.c +++ b/src/lib/elm_animator.c @@ -143,7 +143,7 @@ _animator_parent_del(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE /** * Get the value of reverse mode. * - * @param animator Animator object + * @param[in] animator Animator object * @return EINA_TRUE is reverse mode * * @ingroup Animator @@ -159,7 +159,7 @@ elm_animator_auto_reverse_get(Elm_Animator *animator) /** * Get the value of repeat count. * - * @param animator Animator object + * @param[in] animator Animator object * @return Repeat count * * @ingroup Animator @@ -175,8 +175,8 @@ elm_animator_repeat_get(Elm_Animator *animator) /** * Set auto reverse function. * - * @param animator Animator object - * @param reverse Reverse or not + * @param[in] animator Animator object + * @param[in] reverse Reverse or not * * @ingroup Animator */ @@ -199,8 +199,8 @@ elm_animator_auto_reverse_set(Elm_Animator *animator, Eina_Bool reverse) /** * Set the animation acceleration style. * - * @param animator Animator object - * @param cs Curve style. Default is ELM_ANIMATOR_CURVE_LINEAR + * @param[in] animator Animator object + * @param[in] cs Curve style. Default is ELM_ANIMATOR_CURVE_LINEAR * * @ingroup Animator */ @@ -234,8 +234,8 @@ elm_animator_curve_style_set(Elm_Animator *animator, /** * Set the operation duration. * - * @param animator Animator object - * @param duration Duration in second + * @param[in] animator Animator object + * @param[in] duration Duration in second * * @ingroup Animator */ @@ -253,9 +253,9 @@ elm_animator_duration_set(Elm_Animator *animator, double duration) * Set the callback function for animator operation. * The range of callback function frame data is to 0 ~ 1 * User can refer this frame value for one's animation frame data. - * @param animator Animator object - * @param op Callback function pointer - * @param data Callback function user argument + * @param[in] animator Animator object + * @param[in] func Callback function pointer + * @param[in] data Callback function user argument * * @ingroup Animator */ @@ -276,7 +276,7 @@ elm_animator_operation_callback_set(Elm_Animator *animator, /** * Add new animator. * - * @param parent Parent object + * @param[in] parent Parent object * @return animator object * * @ingroup Animator @@ -306,7 +306,7 @@ elm_animator_add(Evas_Object *parent) /** * Get the status for the animator operation. * - * @param animator Animator object + * @param[in] animator Animator object * @return EINA_TRUE is animator is operating. * * @ingroup Animator @@ -322,7 +322,7 @@ elm_animator_operating_get(Elm_Animator *animator) /** * Delete animator. * - * @param animator Animator object + * @param[in] animator Animator object * * @ingroup Animator */ @@ -346,9 +346,9 @@ elm_animator_del(Elm_Animator *animator) /** * Set the callback function for the animator end. * - * @param animator Animator object - * @param op Callback function pointer - * @param data Callback function user argument + * @param[in] animator Animator object + * @param[in] func Callback function pointer + * @param[in] data Callback function user argument * * @ingroup Animator */ @@ -367,7 +367,7 @@ elm_animator_completion_callback_set(Elm_Animator *animator, /** * Pause the animator. * - * @param animator Animator object + * @param[in] animator Animator object * * @ingroup Animator */ @@ -386,7 +386,7 @@ elm_animator_pause(Elm_Animator *animator) /** * Resume the animator. * - * @param animator Animator object + * @param[in] animator Animator object * * @ingroup Animator */ @@ -405,7 +405,7 @@ elm_animator_resume(Elm_Animator *animator) /** * Stop animator. * - * @param animator Animator object + * @param[in] animator Animator object * * @ingroup Animator */ @@ -421,8 +421,8 @@ elm_animator_stop(Elm_Animator *animator) /** * Set the animator repeat count. * - * @param animator Animator object - * @param repeat_cnt Repeat count + * @param[in] animator Animator object + * @param[in] repeat_cnt Repeat count * * @ingroup Animator */ @@ -440,7 +440,7 @@ elm_animator_repeat_set(Elm_Animator *animator, unsigned int repeat_cnt) /** * Animate now. * - * @param animator Animator object + * @param[in] animator Animator object * * @ingroup Animator */ diff --git a/src/lib/elm_ctxpopup.c b/src/lib/elm_ctxpopup.c index 9e9445b..1d222c4 100644 --- a/src/lib/elm_ctxpopup.c +++ b/src/lib/elm_ctxpopup.c @@ -831,7 +831,7 @@ _item_obj_create(Elm_Ctxpopup_Item *item, char *group_name) /** * Get the icon object for the given item. * - * @param item Ctxpopup item + * @param[in] item Ctxpopup item * @return Icon object or NULL if the item does not have icon * * @ingroup Ctxpopup @@ -847,8 +847,8 @@ elm_ctxpopup_item_icon_get(Elm_Ctxpopup_Item *item) /** * Disable or Enable the scroller for contextual popup. * - * @param obj Ctxpopup object - * @param disabled disable or enable + * @param[in] obj Ctxpopup object + * @param[in] disabled disable or enable * * @ingroup Ctxpopup */ @@ -874,7 +874,7 @@ elm_ctxpopup_scroller_disabled_set(Evas_Object *obj, Eina_Bool disabled) /** * Get the label for the given item. * - * @param item Ctxpopup item + * @param[in] item Ctxpopup item * @return Label or NULL if the item does not have label * * @ingroup Ctxpopup @@ -891,7 +891,7 @@ elm_ctxpopup_item_label_get(Elm_Ctxpopup_Item *item) /** * Add a new ctxpopup object to the parent. * - * @param parent Parent object + * @param[in] parent Parent object * @return New object or NULL if it cannot be created * * @ingroup Ctxpopup @@ -974,7 +974,7 @@ elm_ctxpopup_add(Evas_Object *parent) /** * Clear all items in given ctxpopup object. * - * @param obj Ctxpopup object + * @param[in] obj Ctxpopup object * * @ingroup Ctxpopup */ @@ -1006,7 +1006,7 @@ elm_ctxpopup_clear(Evas_Object *obj) /** * Change the mode to horizontal or vertical. * - * @param obj Ctxpopup object + * @param[in] obj Ctxpopup object * @param horizontal EINA_TRUE - horizontal mode, EINA_FALSE - vertical mode * * @ingroup Ctxpopup @@ -1044,7 +1044,7 @@ elm_ctxpopup_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) /** * Get the value of current horizontal mode. * - * @param obj Ctxpopup object + * @param[in] obj Ctxpopup object * @return EINA_TRUE - horizontal mode, EINA_FALSE - vertical mode. * * @ingroup Ctxpopup @@ -1064,8 +1064,8 @@ elm_ctxpopup_horizontal_get(Evas_Object *obj) /** * reset the icon on the given item. * - * @param obj Ctxpopup item - * @param icon Icon object to be set + * @param[in] item Ctxpopup item + * @param[in] icon Icon object to be set * * @ingroup Ctxpopup */ @@ -1097,8 +1097,8 @@ elm_ctxpopup_item_icon_set(Elm_Ctxpopup_Item *item, Evas_Object *icon) /** * reset the label on the given item. * - * @param obj Ctxpopup item - * @param label Label to be set + * @param[in] item Ctxpopup item + * @param[in] label Label to be set * * @ingroup Ctxpopup */ @@ -1130,11 +1130,11 @@ elm_ctxpopup_item_label_set(Elm_Ctxpopup_Item *item, const char *label) /** * Add a new item in given ctxpopup object. * - * @param obj Ctxpopup object - * @param icon Icon to be set - * @param label Label to be set - * @param func Callback function to call when this item click is clicked - * @param data User data for callback function + * @param[in] obj Ctxpopup object + * @param[in] icon Icon to be set + * @param[in] label Label to be set + * @param[in] func Callback function to call when this item click is clicked + * @param[in] data User data for callback function * @return Added ctxpopup item * * @ingroup Ctxpopup @@ -1182,7 +1182,7 @@ elm_ctxpopup_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, /** * Delete the given item in ctxpopup object. * - * @param item Ctxpopup item to be deleted + * @param item[in] Ctxpopup item to be deleted * * @ingroup Ctxpopup */ @@ -1220,8 +1220,8 @@ elm_ctxpopup_item_del(Elm_Ctxpopup_Item *item) /** * Disable or Enable the given item. Once an item is disabled, the click event will be never happend for the item. * - * @param item Ctxpopup item to be disabled - * @param disabled EINA_TRUE - disable, EINA_FALSE - enable + * @param[in] item Ctxpopup item to be disabled + * @param[in] disabled EINA_TRUE - disable, EINA_FALSE - enable * * @ingroup Ctxpopup */ @@ -1247,8 +1247,8 @@ elm_ctxpopup_item_disabled_set(Elm_Ctxpopup_Item *item, Eina_Bool disabled) /** * Disable or Enable background dimmed function - * @param obj Ctxpopup object - * @param dimmed EINA_TRUE - disable, EINA_FALSE - enable + * @param[in] obj Ctxpopup object + * @param[in] dimmed EINA_TRUE - disable, EINA_FALSE - enable * * @ingroup Ctxpopup */ @@ -1272,10 +1272,10 @@ elm_ctxpopup_screen_dimmed_disabled_set(Evas_Object *obj, Eina_Bool disabled) /** * Append additional button in ctxpoppup bottom layout. - * @param obj Ctxpopup object - * @param label Button label - * @param func Button clicked event callback function - * @param data Button clicked event callback function data + * @param[in] obj Ctxpopup object + * @param[in] label Button label + * @param[in] func Button clicked event callback function + * @param[in] data Button clicked event callback function data * * @ingroup Ctxpopup */ @@ -1323,11 +1323,11 @@ elm_ctxpopup_button_append(Evas_Object *obj, const char *label, * * This functions gives user to set the priority of ctxpopup box showing position. * - * @param obj Ctxpopup object - * @param first 1st priority of arrow direction - * @param second 2nd priority of arrow direction - * @param third 3th priority of arrow direction - * @param fourth 4th priority of arrow direction + * @param[in] obj Ctxpopup object + * @param[in] first 1st priority of arrow direction + * @param[in] second 2nd priority of arrow direction + * @param[in] third 3th priority of arrow direction + * @param[in] fourth 4th priority of arrow direction * * @ingroup Ctxpopup */ @@ -1351,8 +1351,8 @@ elm_ctxpopup_arrow_priority_set(Evas_Object *obj, Elm_Ctxpopup_Arrow first, /** * Swallow the user content * - * @param obj Ctxpopup object - * @param content Content to be swallowed + * @param[in] obj Ctxpopup object + * @param[in] content Content to be swallowed * * @ingroup Ctxpopup */ @@ -1384,7 +1384,7 @@ elm_ctxpopup_content_set(Evas_Object *obj, Evas_Object *content) /** * Unswallow the user content * - * @param obj Ctxpopup object + * @param[in] obj Ctxpopup object * @return The unswallowed content * * @ingroup Ctxpopup @@ -1419,8 +1419,8 @@ elm_ctxpopup_content_unset(Evas_Object *obj) * Basically, ctxpopup position is computed internally. When user call evas_object_move, * Ctxpopup will be showed up with that position which is indicates the arrow point. * - * @param obj Ctxpopup object - * @param forced EINA_TRUE is left-top. EINA_FALSE is indicates arrow point. + * @param[in] obj Ctxpopup object + * @param[in] forced EINA_TRUE is left-top. EINA_FALSE is indicates arrow point. * * @ingroup Ctxpopup */ @@ -1442,7 +1442,7 @@ elm_ctxpopup_position_forced_set(Evas_Object *obj, Eina_Bool forced) /** * Get the status of the position forced * - * @param obj Ctxpopup objet + * @param[in] obj Ctxpopup objet * @return value of position forced * * @ingroup Ctxpopup @@ -1477,8 +1477,8 @@ elm_ctxpopup_label_add(Evas_Object *obj, const char *label, * Set the area of ctxpopup will show up. Ctxpopup will not be out of this area. * The responsibility of the area object is to user. * - * @param obj Ctxpopup objet - * @param area area object + * @param[in] obj Ctxpopup objet + * @param[in] area area object * * @ingroup Ctxpopup */ diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c index 0a91035..6b29306 100644 --- a/src/lib/elm_dayselector.c +++ b/src/lib/elm_dayselector.c @@ -87,9 +87,9 @@ _theme_hook(Evas_Object *obj) /** * Set the state of given check object. * - * @param obj Dayselector - * @param day day user want to know. - * @param checked state of the day. Eina_True is checked. + * @param[in] obj Dayselector + * @param[in] day day user want to know. + * @param[in] checked state of the day. Eina_True is checked. * * @ingroup Dayselector */ @@ -107,8 +107,8 @@ elm_dayselector_check_state_set(Evas_Object *obj, Elm_DaySelector_Day day, Eina_ /** * Get the state of given check object. * - * @param obj Dayselector - * @param day day user want to know. + * @param[in] obj Dayselector + * @param[in] day day user want to know. * * @ingroup Dayselector */ @@ -146,7 +146,7 @@ _sizing_eval(Evas_Object* obj) /** * Add the dayselector. * - * @param item Parent object. + * @param[in] item Parent object. * * @ingroup Dayselector */ diff --git a/src/lib/elm_slidingdrawer.c b/src/lib/elm_slidingdrawer.c index 47ccfda..37a549d 100644 --- a/src/lib/elm_slidingdrawer.c +++ b/src/lib/elm_slidingdrawer.c @@ -1,298 +1,298 @@ -/* - * @defgroup SlidingDrawer SlidingDrawer - * @ingroup Elementary - * - * This is a slidingdrawer. +/* + * @defgroup SlidingDrawer SlidingDrawer + * @ingroup Elementary + * + * This is a slidingdrawer. */ - -#include -#include "elm_priv.h" - -typedef struct _Widget_Data Widget_Data; - -struct _Widget_Data -{ - Evas_Object *parent; - Evas_Object *base; - Evas_Object *handler; - Evas_Object *dragable_rect; - Elm_SlidingDrawer_Pos pos; - Evas_Coord max_drag_w; - Evas_Coord max_drag_h; - Elm_SlidingDrawer_Drag_Value value; -}; - -static const char *widtype = NULL; -static void _del_hook(Evas_Object *obj); -static void _theme_hook(Evas_Object *obj); -static void _sizing_eval(Evas_Object *obj); -static void _parent_resize(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _drag_cb(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _up_cb(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _down_cb(void *data, Evas_Object *obj, const char *emission, const char *source); - -static void -_del_hook(Evas_Object *obj) -{ - Widget_Data *wd = (Widget_Data *) elm_widget_data_get(obj); - free(wd); -} - -static void -_theme_hook(Evas_Object *obj) -{ - Widget_Data *wd = (Widget_Data *) elm_widget_data_get(obj); - elm_slidingdrawer_pos_set(obj, wd->pos); -} - -static void -_parent_resize(void *data, Evas *e, Evas_Object *obj, void *event_info) -{ - _sizing_eval(data); -} - -static void -_drag_cb(void *data, Evas_Object *obj, const char *emission, const char *source) -{ - Widget_Data *wd = elm_widget_data_get(data); - edje_object_part_drag_value_get(wd->base, "elm.dragable.handler", &wd->value.x, &wd->value.y); - evas_object_smart_callback_call(data, "mouse,move", (void*) &wd->value); -} - -static void -_up_cb(void *data, Evas_Object *obj, const char *emission, const char *source) -{ - Widget_Data *wd = elm_widget_data_get(data); - edje_object_part_drag_value_get(wd->base, "elm.dragable.handler", &wd->value.x, &wd->value.y); - evas_object_smart_callback_call(data, "mouse,up", (void*) &wd->value); -} - -static void -_down_cb(void *data, Evas_Object *obj, const char *emission, const char *source) -{ - Widget_Data *wd = elm_widget_data_get(data); - edje_object_part_drag_value_get(wd->base, "elm.dragable.handler", &wd->value.x, &wd->value.y); - evas_object_smart_callback_call(data, "mouse,down", (void*) &wd->value); -} - + +#include +#include "elm_priv.h" + +typedef struct _Widget_Data Widget_Data; + +struct _Widget_Data +{ + Evas_Object *parent; + Evas_Object *base; + Evas_Object *handler; + Evas_Object *dragable_rect; + Elm_SlidingDrawer_Pos pos; + Evas_Coord max_drag_w; + Evas_Coord max_drag_h; + Elm_SlidingDrawer_Drag_Value value; +}; + +static const char *widtype = NULL; +static void _del_hook(Evas_Object *obj); +static void _theme_hook(Evas_Object *obj); +static void _sizing_eval(Evas_Object *obj); +static void _parent_resize(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _drag_cb(void *data, Evas_Object *obj, const char *emission, const char *source); +static void _up_cb(void *data, Evas_Object *obj, const char *emission, const char *source); +static void _down_cb(void *data, Evas_Object *obj, const char *emission, const char *source); + +static void +_del_hook(Evas_Object *obj) +{ + Widget_Data *wd = (Widget_Data *) elm_widget_data_get(obj); + free(wd); +} + static void -_sizing_eval(Evas_Object *obj) -{ - Widget_Data *wd; - Evas_Coord x, y, w, h; - const Evas_Object *part; - - wd = elm_widget_data_get(obj); - - evas_object_geometry_get(wd->parent, &x, &y, &w, &h); - evas_object_move(obj, x, y); - evas_object_resize(obj, w, h); - - part = edje_object_part_object_get(wd->base, "elm.dragable.handler"); - - if((wd->pos == ELM_SLIDINGDRAWER_TOP) || (wd->pos == ELM_SLIDINGDRAWER_BOTTOM)) { - edje_object_size_min_get(part, NULL, &h); - }else { - edje_object_size_min_get(part, &w, NULL); - } - - evas_object_size_hint_min_set(wd->handler, w, h); -} +_theme_hook(Evas_Object *obj) +{ + Widget_Data *wd = (Widget_Data *) elm_widget_data_get(obj); + elm_slidingdrawer_pos_set(obj, wd->pos); +} + +static void +_parent_resize(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + _sizing_eval(data); +} + +static void +_drag_cb(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + Widget_Data *wd = elm_widget_data_get(data); + edje_object_part_drag_value_get(wd->base, "elm.dragable.handler", &wd->value.x, &wd->value.y); + evas_object_smart_callback_call(data, "mouse,move", (void*) &wd->value); +} + +static void +_up_cb(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + Widget_Data *wd = elm_widget_data_get(data); + edje_object_part_drag_value_get(wd->base, "elm.dragable.handler", &wd->value.x, &wd->value.y); + evas_object_smart_callback_call(data, "mouse,up", (void*) &wd->value); +} + +static void +_down_cb(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + Widget_Data *wd = elm_widget_data_get(data); + edje_object_part_drag_value_get(wd->base, "elm.dragable.handler", &wd->value.x, &wd->value.y); + evas_object_smart_callback_call(data, "mouse,down", (void*) &wd->value); +} + +static void +_sizing_eval(Evas_Object *obj) +{ + Widget_Data *wd; + Evas_Coord x, y, w, h; + const Evas_Object *part; + + wd = elm_widget_data_get(obj); + + evas_object_geometry_get(wd->parent, &x, &y, &w, &h); + evas_object_move(obj, x, y); + evas_object_resize(obj, w, h); + + part = edje_object_part_object_get(wd->base, "elm.dragable.handler"); + + if((wd->pos == ELM_SLIDINGDRAWER_TOP) || (wd->pos == ELM_SLIDINGDRAWER_BOTTOM)) { + edje_object_size_min_get(part, NULL, &h); + }else { + edje_object_size_min_get(part, &w, NULL); + } + + evas_object_size_hint_min_set(wd->handler, w, h); +} /** * Unswallow the user content * - * @param obj SlidingDrawer object + * @param[in] obj SlidingDrawer object * @return The unswallowed contents * * @ingroup SlidingDrawer - */ -EAPI Evas_Object * -elm_slidingdrawer_content_unset(Evas_Object *obj) -{ - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd; - Evas_Object *content; - - wd = elm_widget_data_get(obj); - - content = edje_object_part_swallow_get(wd->base, "elm.swallow.content"); - if(!content) return NULL; - edje_object_part_unswallow(wd->base, content); - elm_widget_sub_object_del(obj, content); - return content; -} + */ +EAPI Evas_Object * +elm_slidingdrawer_content_unset(Evas_Object *obj) +{ + ELM_CHECK_WIDTYPE(obj, widtype) NULL; + Widget_Data *wd; + Evas_Object *content; + + wd = elm_widget_data_get(obj); + + content = edje_object_part_swallow_get(wd->base, "elm.swallow.content"); + if(!content) return NULL; + edje_object_part_unswallow(wd->base, content); + elm_widget_sub_object_del(obj, content); + return content; +} /** * Swallow the user contents * - * @param obj SlidingDrawer object - * @param content Content to be swallowed. + * @param[in] obj SlidingDrawer object + * @param[in] content Content to be swallowed. * * @ingroup SlidingDrawer - */ -EAPI void -elm_slidingdrawer_content_set (Evas_Object *obj, Evas_Object *content) -{ - ELM_CHECK_WIDTYPE(obj, widtype); + */ +EAPI void +elm_slidingdrawer_content_set (Evas_Object *obj, Evas_Object *content) +{ + ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - Evas_Object *prev_content; - if (!content) return; - - elm_widget_sub_object_add(obj, content); - - prev_content = edje_object_part_swallow_get(wd->base, "elm.swallow.content"); - if(prev_content) { - edje_object_part_unswallow(wd->base, prev_content); + Evas_Object *prev_content; + if (!content) return; + + elm_widget_sub_object_add(obj, content); + + prev_content = edje_object_part_swallow_get(wd->base, "elm.swallow.content"); + if(prev_content) { + edje_object_part_unswallow(wd->base, prev_content); elm_widget_sub_object_del(obj, prev_content); evas_object_del(prev_content); } - + edje_object_part_swallow (wd->base, "elm.swallow.content", content); -} +} /** * Set the position of SlidingDrawer * - * @param obj SlidingDrawer object - * @param pos + * @param[in] obj SlidingDrawer object + * @param[in] pos * * @ingroup SlidingDrawer - */ -EAPI void -elm_slidingdrawer_pos_set(Evas_Object *obj, Elm_SlidingDrawer_Pos pos) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - - Widget_Data *wd = elm_widget_data_get(obj); - - switch(pos) - { - case ELM_SLIDINGDRAWER_BOTTOM: - _elm_theme_object_set(obj, wd->base, "slidingdrawer", "bottom", elm_widget_style_get(obj)); - break; - case ELM_SLIDINGDRAWER_LEFT: - _elm_theme_object_set(obj, wd->base, "slidingdrawer", "left", elm_widget_style_get(obj)); - break; - case ELM_SLIDINGDRAWER_RIGHT: - _elm_theme_object_set(obj, wd->base, "slidingdrawer", "right", elm_widget_style_get(obj)); - break; - case ELM_SLIDINGDRAWER_TOP: - _elm_theme_object_set(obj, wd->base, "slidingdrawer", "top", elm_widget_style_get(obj)); - break; - } - - edje_object_part_drag_value_set(wd->base, "elm.dragable.handler", 0, 0); - wd->pos = pos; - _sizing_eval(obj); -} + */ +EAPI void +elm_slidingdrawer_pos_set(Evas_Object *obj, Elm_SlidingDrawer_Pos pos) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + + Widget_Data *wd = elm_widget_data_get(obj); + + switch(pos) + { + case ELM_SLIDINGDRAWER_BOTTOM: + _elm_theme_object_set(obj, wd->base, "slidingdrawer", "bottom", elm_widget_style_get(obj)); + break; + case ELM_SLIDINGDRAWER_LEFT: + _elm_theme_object_set(obj, wd->base, "slidingdrawer", "left", elm_widget_style_get(obj)); + break; + case ELM_SLIDINGDRAWER_RIGHT: + _elm_theme_object_set(obj, wd->base, "slidingdrawer", "right", elm_widget_style_get(obj)); + break; + case ELM_SLIDINGDRAWER_TOP: + _elm_theme_object_set(obj, wd->base, "slidingdrawer", "top", elm_widget_style_get(obj)); + break; + } + + edje_object_part_drag_value_set(wd->base, "elm.dragable.handler", 0, 0); + wd->pos = pos; + _sizing_eval(obj); +} /** * Set the current dragable value. * - * @param obj SlidingDrawer object - * @param dx The x value (range: 0 ~ 1) - * @param dy The y value (range: 0 ~ 1) + * @param[in] obj SlidingDrawer object + * @param[in] dx The x value (range: 0 ~ 1) + * @param[in] dy The y value (range: 0 ~ 1) * * @ingroup SlidingDrawer - */ -EAPI void -elm_slidingdrawer_drag_value_set(Evas_Object *obj, double dx, double dy) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd; - wd = elm_widget_data_get(obj); - edje_object_part_drag_value_set(wd->base, "elm.dragable.handler", dx, dy); -} + */ +EAPI void +elm_slidingdrawer_drag_value_set(Evas_Object *obj, double dx, double dy) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd; + wd = elm_widget_data_get(obj); + edje_object_part_drag_value_set(wd->base, "elm.dragable.handler", dx, dy); +} /** * Set the dragable max value. * - * @param obj SlidingDrawer object - * @param dw The maximum width value (range: 0 ~ 1) - * @param dh The maximum height value (range: 0 ~ 1) + * @param[in] obj SlidingDrawer object + * @param[in] dw The maximum width value (range: 0 ~ 1) + * @param[in] dh The maximum height value (range: 0 ~ 1) * * @ingroup SlidingDrawer - */ -EAPI void -elm_slidingdrawer_max_drag_value_set(Evas_Object *obj, double dw, double dh) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd; - Evas_Coord w, h; - - wd = elm_widget_data_get(obj); - wd->max_drag_w = dw; - wd->max_drag_h = dh; - _sizing_eval(obj); - - evas_object_geometry_get(wd->parent, NULL, NULL, &w, &h); - evas_object_size_hint_max_set(wd->dragable_rect, ((double) w) * dw, ((double) h) * dh); -} - + */ +EAPI void +elm_slidingdrawer_max_drag_value_set(Evas_Object *obj, double dw, double dh) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd; + Evas_Coord w, h; + + wd = elm_widget_data_get(obj); + wd->max_drag_w = dw; + wd->max_drag_h = dh; + _sizing_eval(obj); + + evas_object_geometry_get(wd->parent, NULL, NULL, &w, &h); + evas_object_size_hint_max_set(wd->dragable_rect, ((double) w) * dw, ((double) h) * dh); +} + /** * Add a new slidingdrawer object to the parent. * - * @param parent Parent object + * @param[in] parent Parent object * @return New object or NULL if it cannot be created * * @ingroup SlidingDrawer */ -EAPI Evas_Object * -elm_slidingdrawer_add(Evas_Object *parent) -{ - Evas_Object *obj; - Evas *e; - Widget_Data *wd; - - wd = ELM_NEW(Widget_Data); - if(!wd) return NULL; - - ELM_SET_WIDTYPE(widtype, "slidingdrawer"); - - wd->max_drag_w = 1; - wd->max_drag_h = 1; - - wd->parent = parent; +EAPI Evas_Object * +elm_slidingdrawer_add(Evas_Object *parent) +{ + Evas_Object *obj; + Evas *e; + Widget_Data *wd; + + wd = ELM_NEW(Widget_Data); + if(!wd) return NULL; + + ELM_SET_WIDTYPE(widtype, "slidingdrawer"); + + wd->max_drag_w = 1; + wd->max_drag_h = 1; + + wd->parent = parent; e = evas_object_evas_get(parent); - if(!e) return NULL; - - //widget - obj = elm_widget_add(e); - elm_widget_type_set(obj, "slidingdrawer"); - elm_widget_sub_object_add(parent, obj); - elm_widget_data_set(obj, wd); - elm_widget_del_hook_set(obj, _del_hook); - elm_widget_theme_hook_set(obj, _theme_hook); - elm_widget_can_focus_set(obj, EINA_FALSE); - - //base - wd->base = edje_object_add(e); - _elm_theme_object_set(obj, wd->base, "slidingdrawer", "bottom", "default"); - edje_object_signal_callback_add(wd->base, "drag", "*", _drag_cb, obj); - edje_object_signal_callback_add(wd->base, "mouse,up,*", "*", _up_cb, obj); - edje_object_signal_callback_add(wd->base, "mouse,down,*", "*", _down_cb, obj); - elm_widget_sub_object_add(obj, wd->base); - elm_widget_resize_object_set(obj, wd->base); - - //dragable_rect - wd->dragable_rect = evas_object_rectangle_add(e); - edje_object_part_swallow(wd->base, "elm.swallow.dragable_rect", wd->dragable_rect); - - //handler - wd->handler = evas_object_rectangle_add(e); - evas_object_color_set(wd->handler, 0, 0, 0, 0); - edje_object_part_swallow(wd->base, "elm.dragable.handler", wd->handler); - - evas_object_event_callback_add(parent, EVAS_CALLBACK_RESIZE, _parent_resize, obj); - - _sizing_eval(obj); - - return obj; -} - + if(!e) return NULL; + + //widget + obj = elm_widget_add(e); + elm_widget_type_set(obj, "slidingdrawer"); + elm_widget_sub_object_add(parent, obj); + elm_widget_data_set(obj, wd); + elm_widget_del_hook_set(obj, _del_hook); + elm_widget_theme_hook_set(obj, _theme_hook); + elm_widget_can_focus_set(obj, EINA_FALSE); + + //base + wd->base = edje_object_add(e); + _elm_theme_object_set(obj, wd->base, "slidingdrawer", "bottom", "default"); + edje_object_signal_callback_add(wd->base, "drag", "*", _drag_cb, obj); + edje_object_signal_callback_add(wd->base, "mouse,up,*", "*", _up_cb, obj); + edje_object_signal_callback_add(wd->base, "mouse,down,*", "*", _down_cb, obj); + elm_widget_sub_object_add(obj, wd->base); + elm_widget_resize_object_set(obj, wd->base); + + //dragable_rect + wd->dragable_rect = evas_object_rectangle_add(e); + edje_object_part_swallow(wd->base, "elm.swallow.dragable_rect", wd->dragable_rect); + + //handler + wd->handler = evas_object_rectangle_add(e); + evas_object_color_set(wd->handler, 0, 0, 0, 0); + edje_object_part_swallow(wd->base, "elm.dragable.handler", wd->handler); + + evas_object_event_callback_add(parent, EVAS_CALLBACK_RESIZE, _parent_resize, obj); + + _sizing_eval(obj); + + return obj; +} + diff --git a/src/lib/elm_transit.c b/src/lib/elm_transit.c index 50fc822..f37fae7 100644 --- a/src/lib/elm_transit.c +++ b/src/lib/elm_transit.c @@ -164,8 +164,8 @@ _transit_fx_del(Elm_Effect *effect) /** * Set the event blocked when transit is operating. * - * @param transit Transit object - * @param disabled Disable or enable + * @param[in] transit Transit object + * @param[in] disabled Disable or enable * * @ingroup Transit */ @@ -193,7 +193,7 @@ elm_transit_event_block_disabled_set(Elm_Transit *transit, Eina_Bool disabled) /** * Get the value of event blockd status. * - * @param transit Transit + * @param[in] transit Transit * @return EINA_TRUE, when event block is disabled * * @ingroup Transit @@ -209,8 +209,8 @@ elm_transit_event_block_disabled_get(Elm_Transit *transit) /** * Remove effect from transit. * - * @param transit Transit - * @param effect Effect to be removed + * @param[in] transit Transit + * @param[in] effect Effect to be removed * @return EINA_TRUE, if the effect is removed * @warning If removed effect does not inserted in any transit, it will be deleted. * @@ -242,7 +242,7 @@ elm_transit_fx_remove(Elm_Transit *transit, Elm_Effect *effect) /** * Remove all current inserted effects. * - * @param transit Transit + * @param[in] transit Transit * * @ingroup Transit */ @@ -266,7 +266,7 @@ elm_transit_fx_clear(Elm_Transit *transit) /** * Get the list of current inseted effects. * - * @param transit Transit + * @param[in] transit Transit * @return Effect list * * @ingroup Transit @@ -282,9 +282,9 @@ elm_transit_fx_get(Elm_Transit *transit) /** * Set the user-callback function when the transit operation is done. * - * @param transit Transit - * @param op Callback function pointer - * @param data Callback funtion user data + * @param[in] transit Transit + * @param[in] op Callback function pointer + * @param[in] data Callback funtion user data * * @ingroup Transit */ @@ -303,7 +303,7 @@ elm_transit_completion_callback_set(Elm_Transit *transit, /** * Delete transit. * - * @param transit Transit to be deleted + * @param[in] transit Transit to be deleted * * @ingroup Transit */ @@ -352,7 +352,7 @@ elm_transit_curve_style_set(Elm_Transit *transit, Elm_Animator_Curve_Style cs) /** * Add new transit. * - * @param parent Parent object + * @param[in] parent Parent object * @return transit * * @ingroup Transit @@ -392,8 +392,8 @@ elm_transit_add(Evas_Object *parent) /** * Set reverse effect automatically. * - * @param transit Transit - * @param reverse EINA_TRUE is reverse. + * @param[in] transit Transit + * @param[in] reverse EINA_TRUE is reverse. * * @ingroup Transit */ @@ -408,8 +408,8 @@ elm_transit_auto_reverse_set(Elm_Transit *transit, Eina_Bool reverse) /** * Insert an effect into the transit. * - * @param transit Transit - * @param effect Effect to be inserted + * @param[in] transit Transit + * @param[in] effect Effect to be inserted * @return EINA_TRUE is success * * @ingroup Transit @@ -439,8 +439,8 @@ elm_transit_fx_insert(Elm_Transit *transit, Elm_Effect *effect) /** * Set the transit repeat count. Effect will be repeated by repeat count. * - * @param transit Transit - * @param repeat Repeat count + * @param[in] transit Transit + * @param[in] repeat Repeat count * * @ingroup Transit */ @@ -455,7 +455,7 @@ elm_transit_repeat_set(Elm_Transit *transit, unsigned int repeat) /** * Stop the current transit, if the transit is operating. * - * @param transit Transit + * @param[in] transit Transit * * @ingroup Transit */ @@ -470,8 +470,8 @@ elm_transit_stop(Elm_Transit *transit) /** * Run the all the inserted effects. * - * @param transit Transit - * @param duration Transit time in seconds + * @param[in] transit Transit + * @param[in] duration Transit time in seconds * * @ingroup Transit */ @@ -501,7 +501,7 @@ elm_transit_run(Elm_Transit *transit, double duration) /** * Pause the transit * - * @param transit Transit + * @param[in] transit Transit * * @ingroup Transit */ @@ -517,7 +517,7 @@ elm_transit_pause(Elm_Transit *transit) /** * Resume the transit * - * @param transit Transit + * @param[in] transit Transit * * @ingroup Transit */ @@ -575,11 +575,11 @@ _elm_fx_resizing_op(void *data, Elm_Animator *animator, double frame) /** * Add Resizing effect. * - * @param obj Evas_Object that effect is applying to - * @param from_w Object width size when effect begins - * @param from_h Object height size when effect begins - * @param to_w Object width size when effect ends - * @param to_h Object height size when effect ends + * @param[in] obj Evas_Object that effect is applying to + * @param[in] from_w Object width size when effect begins + * @param[in] from_h Object height size when effect begins + * @param[in] to_w Object width size when effect ends + * @param[in] to_h Object height size when effect ends * @return Resizing effect * * @ingroup Transit @@ -676,11 +676,11 @@ _elm_fx_translation_op(void *data, Elm_Animator *animator, double frame) /** * Add Translation effect. * - * @param obj Evas_Object that effect is applying to - * @param from_x Position X when effect begins - * @param from_y Position Y when effect begins - * @param to_x Position X when effect ends - * @param to_y Position Y when effect ends + * @param[in] obj Evas_Object that effect is applying to + * @param[in] from_x Position X when effect begins + * @param[in] from_y Position Y when effect begins + * @param[in] to_x Position X when effect ends + * @param[in] to_y Position Y when effect ends * @return Translation effect * * @ingroup Transit @@ -784,9 +784,9 @@ _elm_fx_zoom_op(void *data, Elm_Animator *animator, double frame) /** * Add Zoom effect. * - * @param obj Evas_Object that effect is applying to - * @param from_rate Scale rate when effect begins (1 is current rate) - * @param to_rate Scale rate when effect ends + * @param[in] obj Evas_Object that effect is applying to + * @param[in] from_rate Scale rate when effect begins (1 is current rate) + * @param[in] to_rate Scale rate when effect ends * @return Zoom effect * * @ingroup Transit @@ -930,10 +930,10 @@ _elm_fx_flip_op(void *data, Elm_Animator *animator, double frame) /** * Add Flip effect. * - * @param front Front surface object - * @param back Back surface object - * @param axis Flipping Axis(X or Y) - * @param cw Flipping Direction. EINA_TRUE is clock-wise + * @param[in] front Front surface object + * @param[in] back Back surface object + * @param[in] axis Flipping Axis(X or Y) + * @param[in] cw Flipping Direction. EINA_TRUE is clock-wise * @return Flip effect * * @ingroup Transit @@ -1099,16 +1099,19 @@ _elm_fx_resizable_flip_op(void *data, Elm_Animator *animator, double frame) if ((degree < 90) && (degree > -90)) { obj = resizable_flip->front; - evas_object_hide(resizable_flip->back); - evas_object_show(resizable_flip->front); + if(resizable_flip->back != resizable_flip->front) { + evas_object_hide(resizable_flip->back); + evas_object_show(resizable_flip->front); } + } else { obj = resizable_flip->back; - evas_object_hide(resizable_flip->front); - evas_object_show(resizable_flip->back); - } - + if(resizable_flip->back != resizable_flip->front) { + evas_object_hide(resizable_flip->front); + evas_object_show(resizable_flip->back); + } + } evas_map_smooth_set(map, EINA_TRUE); x = resizable_flip->from_pos.x + (resizable_flip->to_pos.x * frame); @@ -1144,10 +1147,10 @@ _elm_fx_resizable_flip_op(void *data, Elm_Animator *animator, double frame) /** * Add ResizbleFlip effect. the size of each surface objects are interpolated automatically. * - * @param front Front surface object - * @param back Back surface object - * @param axis Flipping Axis.(X or Y) - * @param cw Flipping Direction. EINA_TRUE is clock-wise + * @param[in] front Front surface object + * @param[in] back Back surface object + * @param[in] axis Flipping Axis.(X or Y) + * @param[in] cw Flipping Direction. EINA_TRUE is clock-wise * @return Flip effect * * @ingroup Transit @@ -1402,9 +1405,9 @@ _elm_fx_wipe_op(void *data, Elm_Animator *animator, double frame) /** * Add Wipe effect. * - * @param obj Evas_Object that effect is applying to - * @param type Wipe type. Hide or show - * @param dir Wipe Direction + * @param[in] obj Evas_Object that effect is applying to + * @param[in] type Wipe type. Hide or show + * @param[in] dir Wipe Direction * @return Wipe effect * * @ingroup Transit @@ -1488,15 +1491,15 @@ _elm_fx_color_op(void *data, Elm_Animator *animator, double frame) /** * Add Color effect. * - * @param obj Evas_Object that effect is applying to - * @param from_r RGB R when effect begins - * @param from_g RGB G when effect begins - * @param from_b RGB B when effect begins - * @param from_a RGB A when effect begins - * @param to_r RGB R when effect ends - * @param to_g RGB G when effect ends - * @param to_b RGB B when effect ends - * @param to_a RGB A when effect ends + * @param[in] obj Evas_Object that effect is applying to + * @param[in] from_r RGB R when effect begins + * @param[in] from_g RGB G when effect begins + * @param[in] from_b RGB B when effect begins + * @param[in] from_a RGB A when effect begins + * @param[in] to_r RGB R when effect ends + * @param[in] to_g RGB G when effect ends + * @param[in] to_b RGB B when effect ends + * @param[in] to_a RGB A when effect ends * @return Color Effect * * @ingroup Transit @@ -1631,8 +1634,8 @@ _elm_fx_fade_op(void *data, Elm_Animator *animator, double frame) /** * Add Fade effect * - * @param before Evas Object before fade in - * @param after Evas Object after fade out + * @param[in] before Evas Object before fade in + * @param[in] after Evas Object after fade out * @return Fade effect * * @ingroup Transit @@ -1736,8 +1739,8 @@ _elm_fx_blend_op(void *data, Elm_Animator *animator, double frame) /** * Add Blend effect * - * @param before Evas Object before blending - * @param after Evas Object after blending + * @param[in] before Evas Object before blending + * @param[in] after Evas Object after blending * @return Blend effect * * @ingroup Transit @@ -1856,10 +1859,10 @@ _elm_fx_rotation_op(void *data, Elm_Animator *animator, double frame) /** * Add Rotation effect * - * @param obj Evas_Object that effect is applying to - * @param from degree Degree when effect begins - * @param to_degree Degree when effect is ends - * @param cw Rotation direction. EINA_TRUE is clock wise + * @param[in] obj Evas_Object that effect is applying to + * @param[in] from degree Degree when effect begins + * @param[in] to_degree Degree when effect is ends + * @param[in] cw Rotation direction. EINA_TRUE is clock wise * @return Rotation effect * * @ingroup Transit @@ -1953,9 +1956,9 @@ _elm_fx_image_animation_del(void *data) /** * Add image_animation effect. * - * @param obj Icon object - * @param images Array of image file path. - * @param img_cnt Count of image. + * @param[in] obj Icon object + * @param[in] images Array of image file path. + * @param[in] img_cnt Count of image. * @return ImageAnimation effect. * * @ingroup Transit