From 4fdf748ce9280489a92940fe80ecbb9e98b3f2ff Mon Sep 17 00:00:00 2001 From: Rajeev Ranjan Date: Tue, 7 Dec 2010 18:15:32 +0530 Subject: [PATCH] [src/lib/elm_slidingdrawer.c] Code cleanup --- src/lib/elm_slidingdrawer.c | 117 ++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 76 deletions(-) diff --git a/src/lib/elm_slidingdrawer.c b/src/lib/elm_slidingdrawer.c index db8dd83..5611872 100644 --- a/src/lib/elm_slidingdrawer.c +++ b/src/lib/elm_slidingdrawer.c @@ -30,22 +30,17 @@ 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 _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); - evas_object_event_callback_del(wd->parent, EVAS_CALLBACK_RESIZE, - _parent_resize); + evas_object_event_callback_del(wd->parent, EVAS_CALLBACK_RESIZE, _parent_resize); free(wd); } @@ -64,13 +59,11 @@ _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) +_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); + 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); } @@ -79,19 +72,16 @@ _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); + 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) +_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); + 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); } @@ -110,21 +100,15 @@ _sizing_eval(Evas_Object *obj) evas_object_move(obj, x, y); evas_object_resize(obj, w, h); - evas_object_size_hint_max_set(wd->dragable_rect, - ((double)w) * wd->max_drag_w, - ((double)h) * wd->max_drag_h); + evas_object_size_hint_max_set(wd->dragable_rect, ((double)w) * wd->max_drag_w, ((double)h) * wd->max_drag_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); - } + edje_object_size_min_get(part, NULL, &h); else - { - edje_object_size_min_get(part, &w, NULL); - } + edje_object_size_min_get(part, &w, NULL); evas_object_size_hint_min_set(wd->handler, w, h); } @@ -142,11 +126,8 @@ 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; @@ -158,42 +139,34 @@ elm_slidingdrawer_content_unset(Evas_Object *obj) /** * Swallow the user contents * - * @param[in] obj SlidingDrawer object - * @param[in] 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_slidingdrawer_content_set(Evas_Object *obj, Evas_Object *content){ ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd; - Evas_Object *prev_content; - - if (!content) - return; - + if (!content) return; wd = elm_widget_data_get(obj); 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_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[in] obj SlidingDrawer object - * @param[in] pos + * @param[in] obj SlidingDrawer object + * @param[in] pos Position of drawer's handle * * @ingroup SlidingDrawer */ @@ -206,22 +179,18 @@ elm_slidingdrawer_pos_set(Evas_Object *obj, Elm_SlidingDrawer_Pos pos) 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; + 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); @@ -253,7 +222,7 @@ elm_slidingdrawer_drag_value_set(Evas_Object *obj, double dx, double dy) * * @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) + * @param[in] dh The maximum height value (range: 0 ~ 1) * * @ingroup SlidingDrawer */ @@ -289,7 +258,7 @@ elm_slidingdrawer_add(Evas_Object *parent) wd = ELM_NEW(Widget_Data); if (!wd) - return NULL; + return NULL; ELM_SET_WIDTYPE(widtype, "slidingdrawer"); @@ -299,8 +268,7 @@ elm_slidingdrawer_add(Evas_Object *parent) wd->parent = parent; e = evas_object_evas_get(parent); - if (!e) - return NULL; + if (!e) return NULL; //widget obj = elm_widget_add(e); @@ -316,16 +284,14 @@ elm_slidingdrawer_add(Evas_Object *parent) _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); + 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); elm_widget_sub_object_add(obj, wd->dragable_rect); - edje_object_part_swallow(wd->base, "elm.swallow.dragable_rect", - wd->dragable_rect); + edje_object_part_swallow(wd->base, "elm.swallow.dragable_rect", wd->dragable_rect); //handler wd->handler = evas_object_rectangle_add(e); @@ -333,8 +299,7 @@ elm_slidingdrawer_add(Evas_Object *parent) 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); + evas_object_event_callback_add(parent, EVAS_CALLBACK_RESIZE, _parent_resize, obj); _sizing_eval(obj); -- 2.7.4