From eee28ce5b0ee8df07ae75be51b2dd918ba1e7e55 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 3 Dec 2010 09:13:51 +0900 Subject: [PATCH] [controlbar] fix indentation --- src/lib/elm_controlbar.c | 1875 ++++++++++++++++++++++------------------------ 1 file changed, 911 insertions(+), 964 deletions(-) diff --git a/src/lib/elm_controlbar.c b/src/lib/elm_controlbar.c index 8c575cf..9bdc55c 100644 --- a/src/lib/elm_controlbar.c +++ b/src/lib/elm_controlbar.c @@ -156,10 +156,10 @@ print_all_items(Widget_Data *wd) const Eina_List *l; Elm_Controlbar_Item * item; - EINA_LIST_FOREACH(wd->items, l, item) - { - printf("item label : %s order : %d address : %p\n", item->text, item->order, item); - } + EINA_LIST_FOREACH(wd->items, l, item) + { + printf("item label : %s order : %d address : %p\n", item->text, item->order, item); + } } /////////////////////////////////////////////////////////////////// @@ -187,12 +187,12 @@ _controlbar_move(void *data, Evas_Object * obj) switch(wd->mode) { case ELM_CONTROLBAR_MODE_LEFT: - evas_object_move(wd->view, x + width, y); - break; + evas_object_move(wd->view, x + width, y); + break; case ELM_CONTROLBAR_MODE_RIGHT: default: - evas_object_move(wd->view, x, y); - break; + evas_object_move(wd->view, x, y); + break; } evas_object_move(wd->edit_box, x_, y_); evas_object_move(wd->event_box, x, y); @@ -220,36 +220,36 @@ _controlbar_resize(void *data, Evas_Object * obj) { case ELM_CONTROLBAR_MODE_LEFT: case ELM_CONTROLBAR_MODE_RIGHT: - evas_object_resize(wd->view, w - width, h); - evas_object_resize(wd->edit_box, w + x - x_, h); - break; + evas_object_resize(wd->view, w - width, h); + evas_object_resize(wd->edit_box, w + x - x_, h); + break; default: - evas_object_resize(wd->view, w, h - height + 1); - evas_object_resize(wd->edit_box, w, h + y - y_); - break; + evas_object_resize(wd->view, w, h - height + 1); + evas_object_resize(wd->edit_box, w, h + y - y_); + break; } evas_object_resize(wd->event_box, w, h); EINA_LIST_FOREACH(wd->items, l, item) { - if(item->label) - { - if(!wd->vertical) - { - elm_label_wrap_width_set(item->label, (int)(wd->w/check_bar_item_number(wd))-20); - elm_label_wrap_width_set(item->label_shadow, (int)(wd->w/check_bar_item_number(wd))-20); - } - else - { - elm_label_wrap_width_set(item->label, (int)(wd->w-20)); - elm_label_wrap_width_set(item->label_shadow, (int)(wd->w-20)); - } - } - if(item->edit_label) - { - elm_label_wrap_width_set(item->edit_label, (int)(wd->w/check_bar_item_number(wd))-20); - elm_label_wrap_width_set(item->edit_label_shadow, (int)(wd->w/check_bar_item_number(wd))-20); - } + if(item->label) + { + if(!wd->vertical) + { + elm_label_wrap_width_set(item->label, (int)(wd->w/check_bar_item_number(wd))-20); + elm_label_wrap_width_set(item->label_shadow, (int)(wd->w/check_bar_item_number(wd))-20); + } + else + { + elm_label_wrap_width_set(item->label, (int)(wd->w-20)); + elm_label_wrap_width_set(item->label_shadow, (int)(wd->w-20)); + } + } + if(item->edit_label) + { + elm_label_wrap_width_set(item->edit_label, (int)(wd->w/check_bar_item_number(wd))-20); + elm_label_wrap_width_set(item->edit_label_shadow, (int)(wd->w/check_bar_item_number(wd))-20); + } } } @@ -272,11 +272,10 @@ _controlbar_object_show(void *data, Evas * e, Evas_Object * obj, void *event_info) { Widget_Data * wd; - if (!data) - return; + if (!data) return; wd = elm_widget_data_get((Evas_Object *) data); - if (!wd) - return; + if (!wd) return; + evas_object_show(wd->view); evas_object_show(wd->edit_box); evas_object_show(wd->edje); @@ -289,11 +288,10 @@ _controlbar_object_hide(void *data, Evas * e, Evas_Object * obj, void *event_info) { Widget_Data * wd; - if (!data) - return; + if (!data) return; wd = elm_widget_data_get((Evas_Object *) data); - if (!wd) - return; + if (!wd) return; + evas_object_hide(wd->view); evas_object_hide(wd->edit_box); evas_object_hide(wd->edje); @@ -325,21 +323,20 @@ _item_del(Elm_Controlbar_Item *it) evas_object_del(it->icon_shadow); if (it->base) { - if (it->style != OBJECT) - evas_object_del(it->base); - - else - evas_object_hide(it->base); + if (it->style != OBJECT) + evas_object_del(it->base); + else + evas_object_hide(it->base); } if (it->base_item) - evas_object_del(it->base_item); + evas_object_del(it->base_item); if (it->edit) - evas_object_del(it->edit); + evas_object_del(it->edit); if (it->edit_item) - evas_object_del(it->edit_item); + evas_object_del(it->edit_item); if (it->view) { - evas_object_hide(it->view); + evas_object_hide(it->view); } } @@ -348,16 +345,15 @@ _del_hook(Evas_Object * obj) { Widget_Data * wd = elm_widget_data_get(obj); Elm_Controlbar_Item * item; - Evas_Object * content; - if (!wd) - return; - + //Evas_Object * content; + if (!wd) return; + EINA_LIST_FREE(wd->items, item) - { - _item_del(item); - free(item); - item = NULL; - } + { + _item_del(item); + free(item); + item = NULL; + } /* if (wd->view) { @@ -439,12 +435,11 @@ _theme_hook(Evas_Object * obj) int r, g, b, a; Widget_Data * wd = elm_widget_data_get(obj); - if (!wd) - return; + if (!wd) return; _elm_theme_object_set(obj, wd->edje, "controlbar", "base", - elm_widget_style_get(obj)); + elm_widget_style_get(obj)); _elm_theme_object_set(obj, wd->bg, "controlbar", "background", - elm_widget_style_get(obj)); + elm_widget_style_get(obj)); evas_object_color_get(wd->bg, &r, &g, &b, NULL); evas_object_color_set(wd->bg, r, g, b, (int)(255 * wd->alpha / 100)); elm_layout_theme_set(wd->view, "controlbar", "view", elm_widget_style_get(obj)); @@ -454,36 +449,36 @@ _theme_hook(Evas_Object * obj) _elm_theme_object_set(obj, wd->focused_box_left, "controlbar", "item_bg_move", elm_widget_style_get(obj)); _elm_theme_object_set(obj, wd->focused_box_right, "controlbar", "item_bg_move", elm_widget_style_get(obj)); EINA_LIST_FOREACH(wd->items, l, item) - { - if (item->style != OBJECT) - { - elm_layout_theme_set(item->base, "controlbar", "item_bg", - elm_widget_style_get(obj)); - elm_layout_theme_set(item->edit, "controlbar", "item_bg", - elm_widget_style_get(obj)); - if (!item->editable) - { - color = - (Evas_Object *) - edje_object_part_object_get(_EDJ(item->edit), - "elm.item.uneditable.color"); - if (color) - evas_object_color_get(color, &r, &g, &b, &a); - evas_object_color_set(item->edit_item, r, g, b, a); - } - if (item->label && item->icon) - { - edje_object_signal_emit(_EDJ(item->base_item), - "elm,state,icon_text", "elm"); - edje_object_signal_emit(_EDJ(item->edit_item), - "elm,state,icon_text", "elm"); - } - if (item->selected) - { - selected_box(item); - } - } - } + { + if (item->style != OBJECT) + { + elm_layout_theme_set(item->base, "controlbar", "item_bg", + elm_widget_style_get(obj)); + elm_layout_theme_set(item->edit, "controlbar", "item_bg", + elm_widget_style_get(obj)); + if (!item->editable) + { + color = + (Evas_Object *) + edje_object_part_object_get(_EDJ(item->edit), + "elm.item.uneditable.color"); + if (color) + evas_object_color_get(color, &r, &g, &b, &a); + evas_object_color_set(item->edit_item, r, g, b, a); + } + if (item->label && item->icon) + { + edje_object_signal_emit(_EDJ(item->base_item), + "elm,state,icon_text", "elm"); + edje_object_signal_emit(_EDJ(item->edit_item), + "elm,state,icon_text", "elm"); + } + if (item->selected) + { + selected_box(item); + } + } + } } static void @@ -530,13 +525,10 @@ static void set_evas_map(Evas_Object * obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) { - if (obj == NULL) - { - return; - } + if (obj == NULL) return; Evas_Map * map = evas_map_new(4); - if (map == NULL) - return; + if (map == NULL) return; + evas_map_smooth_set(map, EINA_TRUE); evas_map_util_points_populate_from_object_full(map, obj, 0); evas_object_map_enable_set(obj, EINA_TRUE); @@ -565,17 +557,17 @@ move_evas_map(void *data) dh = ad->th - ad->fh; if (t <= ad->time) { - x = (1 * sin((t / ad->time) * (M_PI / 2)) * dx); - y = (1 * sin((t / ad->time) * (M_PI / 2)) * dy); - w = (1 * sin((t / ad->time) * (M_PI / 2)) * dw); - h = (1 * sin((t / ad->time) * (M_PI / 2)) * dh); + x = (1 * sin((t / ad->time) * (M_PI / 2)) * dx); + y = (1 * sin((t / ad->time) * (M_PI / 2)) * dy); + w = (1 * sin((t / ad->time) * (M_PI / 2)) * dw); + h = (1 * sin((t / ad->time) * (M_PI / 2)) * dh); } else { - x = dx; - y = dy; - w = dw; - h = dh; + x = dx; + y = dy; + w = dw; + h = dh; } px = ad->fx + x; py = ad->fy + y; @@ -583,16 +575,16 @@ move_evas_map(void *data) ph = ad->fh + h; if (x == dx && y == dy && w == dw && h == dh) { - ecore_animator_del(ad->timer); - ad->timer = NULL; - set_evas_map(ad->obj, px, py, pw, ph); - if (ad->func != NULL) - ad->func(ad->data, ad->obj); - return ECORE_CALLBACK_CANCEL; + ecore_animator_del(ad->timer); + ad->timer = NULL; + set_evas_map(ad->obj, px, py, pw, ph); + if (ad->func != NULL) + ad->func(ad->data, ad->obj); + return ECORE_CALLBACK_CANCEL; } else { - set_evas_map(ad->obj, px, py, pw, ph); + set_evas_map(ad->obj, px, py, pw, ph); } return ECORE_CALLBACK_RENEW; } @@ -617,17 +609,17 @@ move_evas_object(void *data) dh = ad->th - ad->fh; if (t <= ad->time) { - x = (1 * sin((t / ad->time) * (M_PI / 2)) * dx); - y = (1 * sin((t / ad->time) * (M_PI / 2)) * dy); - w = (1 * sin((t / ad->time) * (M_PI / 2)) * dw); - h = (1 * sin((t / ad->time) * (M_PI / 2)) * dh); + x = (1 * sin((t / ad->time) * (M_PI / 2)) * dx); + y = (1 * sin((t / ad->time) * (M_PI / 2)) * dy); + w = (1 * sin((t / ad->time) * (M_PI / 2)) * dw); + h = (1 * sin((t / ad->time) * (M_PI / 2)) * dh); } else { - x = dx; - y = dy; - w = dw; - h = dh; + x = dx; + y = dy; + w = dw; + h = dh; } px = ad->fx + x; py = ad->fy + y; @@ -635,20 +627,20 @@ move_evas_object(void *data) ph = ad->fh + h; if (x == dx && y == dy && w == dw && h == dh) { - ecore_animator_del(ad->timer); - ad->timer = NULL; - evas_object_move(ad->obj, px, py); - evas_object_resize(ad->obj, pw, ph); - evas_object_show(ad->obj); - if (ad->func != NULL) - ad->func(ad->data, ad->obj); - return ECORE_CALLBACK_CANCEL; + ecore_animator_del(ad->timer); + ad->timer = NULL; + evas_object_move(ad->obj, px, py); + evas_object_resize(ad->obj, pw, ph); + evas_object_show(ad->obj); + if (ad->func != NULL) + ad->func(ad->data, ad->obj); + return ECORE_CALLBACK_CANCEL; } else { - evas_object_move(ad->obj, px, py); - evas_object_resize(ad->obj, pw, ph); - evas_object_show(ad->obj); + evas_object_move(ad->obj, px, py); + evas_object_resize(ad->obj, pw, ph); + evas_object_show(ad->obj); } return ECORE_CALLBACK_RENEW; } @@ -665,7 +657,7 @@ move_fade_out_object(void *data) int x, y, w, h, a; int r, g, b; - + Animation_Data * ad = (Animation_Data *) data; t = ELM_MAX(0.0, current_time_get() - ad->start_time) / 1000; dx = ad->tx - ad->fx; @@ -675,19 +667,19 @@ move_fade_out_object(void *data) da = 255; if (t <= ad->time) { - x = (1 * sin((t / ad->time) * (M_PI / 2)) * dx); - y = (1 * sin((t / ad->time) * (M_PI / 2)) * dy); - w = (1 * sin((t / ad->time) * (M_PI / 2)) * dw); - h = (1 * sin((t / ad->time) * (M_PI / 2)) * dh); - a = (1 * sin((t / ad->time) * (M_PI / 2)) * da); + x = (1 * sin((t / ad->time) * (M_PI / 2)) * dx); + y = (1 * sin((t / ad->time) * (M_PI / 2)) * dy); + w = (1 * sin((t / ad->time) * (M_PI / 2)) * dw); + h = (1 * sin((t / ad->time) * (M_PI / 2)) * dh); + a = (1 * sin((t / ad->time) * (M_PI / 2)) * da); } else { - x = dx; - y = dy; - w = dw; - h = dh; - a = da; + x = dx; + y = dy; + w = dw; + h = dh; + a = da; } px = ad->fx + x; py = ad->fy + y; @@ -696,26 +688,26 @@ move_fade_out_object(void *data) pa = 255 - a; if (x == dx && y == dy && w == dw && h == dh) { - ecore_animator_del(ad->timer); - ad->timer = NULL; - evas_object_move(ad->obj, px, py); - //evas_object_resize(ad->obj, 480, 600); - evas_object_resize(ad->obj, pw, ph); - evas_object_color_get(ad->obj, &r, &g, &b, &a); - evas_object_color_set(ad->obj, r, g, b, pa); - evas_object_show(ad->obj); - if (ad->func != NULL) - ad->func(ad->data, ad->obj); - return ECORE_CALLBACK_CANCEL; + ecore_animator_del(ad->timer); + ad->timer = NULL; + evas_object_move(ad->obj, px, py); + //evas_object_resize(ad->obj, 480, 600); + evas_object_resize(ad->obj, pw, ph); + evas_object_color_get(ad->obj, &r, &g, &b, &a); + evas_object_color_set(ad->obj, r, g, b, pa); + evas_object_show(ad->obj); + if (ad->func != NULL) + ad->func(ad->data, ad->obj); + return ECORE_CALLBACK_CANCEL; } else { - evas_object_move(ad->obj, px, py); - //evas_object_resize(ad->obj, 480, 600); - evas_object_resize(ad->obj, pw, ph); - evas_object_color_get(ad->obj, &r, &g, &b, &a); - evas_object_color_set(ad->obj, r, g, b, pa); - evas_object_show(ad->obj); + evas_object_move(ad->obj, px, py); + //evas_object_resize(ad->obj, 480, 600); + evas_object_resize(ad->obj, pw, ph); + evas_object_color_get(ad->obj, &r, &g, &b, &a); + evas_object_color_set(ad->obj, r, g, b, pa); + evas_object_show(ad->obj); } return ECORE_CALLBACK_RENEW; } @@ -742,19 +734,19 @@ move_fade_in_object(void *data) da = 255; if (t <= ad->time) { - x = (1 * sin((t / ad->time) * (M_PI / 2)) * dx); - y = (1 * sin((t / ad->time) * (M_PI / 2)) * dy); - w = (1 * sin((t / ad->time) * (M_PI / 2)) * dw); - h = (1 * sin((t / ad->time) * (M_PI / 2)) * dh); - a = (1 * sin((t / ad->time) * (M_PI / 2)) * da); + x = (1 * sin((t / ad->time) * (M_PI / 2)) * dx); + y = (1 * sin((t / ad->time) * (M_PI / 2)) * dy); + w = (1 * sin((t / ad->time) * (M_PI / 2)) * dw); + h = (1 * sin((t / ad->time) * (M_PI / 2)) * dh); + a = (1 * sin((t / ad->time) * (M_PI / 2)) * da); } else { - x = dx; - y = dy; - w = dw; - h = dh; - a = da; + x = dx; + y = dy; + w = dw; + h = dh; + a = da; } px = ad->fx + x; py = ad->fy + y; @@ -763,26 +755,26 @@ move_fade_in_object(void *data) pa = a; if (x == dx && y == dy && w == dw && h == dh) { - ecore_animator_del(ad->timer); - ad->timer = NULL; - evas_object_move(ad->obj, px, py); - //evas_object_resize(ad->obj, 480, 600); - evas_object_resize(ad->obj, pw, ph); - evas_object_color_get(ad->obj, &r, &g, &b, &a); - evas_object_color_set(ad->obj, r, g, b, pa); - evas_object_show(ad->obj); - if (ad->func != NULL) - ad->func(ad->data, ad->obj); - return ECORE_CALLBACK_CANCEL; + ecore_animator_del(ad->timer); + ad->timer = NULL; + evas_object_move(ad->obj, px, py); + //evas_object_resize(ad->obj, 480, 600); + evas_object_resize(ad->obj, pw, ph); + evas_object_color_get(ad->obj, &r, &g, &b, &a); + evas_object_color_set(ad->obj, r, g, b, pa); + evas_object_show(ad->obj); + if (ad->func != NULL) + ad->func(ad->data, ad->obj); + return ECORE_CALLBACK_CANCEL; } else { - evas_object_move(ad->obj, px, py); - //evas_object_resize(ad->obj, 480, 600); - evas_object_resize(ad->obj, pw, ph); - evas_object_color_get(ad->obj, &r, &g, &b, &a); - evas_object_color_set(ad->obj, r, g, b, pa); - evas_object_show(ad->obj); + evas_object_move(ad->obj, px, py); + //evas_object_resize(ad->obj, 480, 600); + evas_object_resize(ad->obj, pw, ph); + evas_object_color_get(ad->obj, &r, &g, &b, &a); + evas_object_color_set(ad->obj, r, g, b, pa); + evas_object_show(ad->obj); } return ECORE_CALLBACK_RENEW; } @@ -826,39 +818,40 @@ item_animation_effect(void *data) const Eina_List *l; Elm_Controlbar_Item * item; int rand; - - if(!wd->xa){ - wd->xa = elm_xml_animator_add(wd->object); - elm_xml_animator_file_set(wd->xa, "/usr/share/xmls/elementary.xml"); - } + + if(!wd->xa) + { + wd->xa = elm_xml_animator_add(wd->object); + elm_xml_animator_file_set(wd->xa, "/usr/share/xmls/elementary.xml"); + } srand(time(NULL)); EINA_LIST_FOREACH(wd->items, l, item) { - rand = random()%100; - if(rand > 65 && item->order > 0) - { - rand = random()%4; - switch(rand) - { - case 0: - elm_xml_animator_object_add(wd->xa, item->base_item, "test", end_item_animation_effect, wd); - break; - case 1: - elm_xml_animator_object_add(wd->xa, item->base_item, "test2", end_item_animation_effect, wd); - break; - case 2: - elm_xml_animator_object_add(wd->xa, item->base_item, "test3", end_item_animation_effect, wd); - break; - case 3: - elm_xml_animator_object_add(wd->xa, item->base_item, "test4", end_item_animation_effect, wd); - break; - default: - break; - } - break; - } + rand = random()%100; + if(rand > 65 && item->order > 0) + { + rand = random()%4; + switch(rand) + { + case 0: + elm_xml_animator_object_add(wd->xa, item->base_item, "test", end_item_animation_effect, wd); + break; + case 1: + elm_xml_animator_object_add(wd->xa, item->base_item, "test2", end_item_animation_effect, wd); + break; + case 2: + elm_xml_animator_object_add(wd->xa, item->base_item, "test3", end_item_animation_effect, wd); + break; + case 3: + elm_xml_animator_object_add(wd->xa, item->base_item, "test4", end_item_animation_effect, wd); + break; + default: + break; + } + break; + } } elm_xml_animator_run(wd->xa); @@ -925,7 +918,7 @@ item_exist_check(Widget_Data *wd, Elm_Controlbar_Item *item) EINA_LIST_FOREACH(wd->items, l, it) { - if(it == item) return EINA_TRUE; + if(it == item) return EINA_TRUE; } return EINA_FALSE; } @@ -938,10 +931,10 @@ check_bar_item_number(Widget_Data *wd) int num = 0; EINA_LIST_FOREACH(wd->items, l, item) - { - if(item->order > 0) num++; - } - + { + if(item->order > 0) num++; + } + return num; } @@ -957,43 +950,43 @@ item_insert_in_bar(Elm_Controlbar_Item * it, int order) if(order == 0) return; EINA_LIST_FOREACH(wd->items, l, item) - { - if (item->order == order && item != it) - check = 1; - } + { + if (item->order == order && item != it) + check = 1; + } if (check) { - EINA_LIST_FOREACH(wd->items, l, item) - { - if (item->order > 0) - elm_table_unpack(wd->box, item->base); - } - EINA_LIST_FOREACH(wd->items, l, item) - { - if (item->order > 0) - { - if (item->order >= order) - item->order += 1; - if(!wd->vertical) - { - elm_table_pack(wd->box, item->base, item->order - 1, 0, 1, 1); - } - else - { - elm_table_pack(wd->box, item->base, 0, item->order - 1, 1, 1); - } - evas_object_show(item->base); - } - } + EINA_LIST_FOREACH(wd->items, l, item) + { + if (item->order > 0) + elm_table_unpack(wd->box, item->base); + } + EINA_LIST_FOREACH(wd->items, l, item) + { + if (item->order > 0) + { + if (item->order >= order) + item->order += 1; + if(!wd->vertical) + { + elm_table_pack(wd->box, item->base, item->order - 1, 0, 1, 1); + } + else + { + elm_table_pack(wd->box, item->base, 0, item->order - 1, 1, 1); + } + evas_object_show(item->base); + } + } } it->order = order; if(!wd->vertical) { - elm_table_pack(wd->box, it->base, it->order - 1, 0, 1, 1); + elm_table_pack(wd->box, it->base, it->order - 1, 0, 1, 1); } else { - elm_table_pack(wd->box, it->base, 0, it->order - 1, 1, 1); + elm_table_pack(wd->box, it->base, 0, it->order - 1, 1, 1); } evas_object_show(it->base); } @@ -1007,33 +1000,33 @@ item_delete_in_bar(Elm_Controlbar_Item * it) int i = 0; EINA_LIST_FOREACH(wd->items, l, item) - { - if (item == it) - { - i = it->order; - it->order = 0; - elm_table_unpack(wd->box, it->base); - evas_object_hide(it->base); - } - } + { + if (item == it) + { + i = it->order; + it->order = 0; + elm_table_unpack(wd->box, it->base); + evas_object_hide(it->base); + } + } if (i) { - EINA_LIST_FOREACH(wd->items, l, item) - { - if (item->order > i) - { - item->order--; - elm_table_unpack(wd->box, item->base); - if(!wd->vertical) - { - elm_table_pack(wd->box, item->base, item->order - 1, 0, 1, 1); - } - else - { - elm_table_pack(wd->box, item->base, 0, item->order - 1, 1, 1); - } - } - } + EINA_LIST_FOREACH(wd->items, l, item) + { + if (item->order > i) + { + item->order--; + elm_table_unpack(wd->box, item->base); + if(!wd->vertical) + { + elm_table_pack(wd->box, item->base, item->order - 1, 0, 1, 1); + } + else + { + elm_table_pack(wd->box, item->base, 0, item->order - 1, 1, 1); + } + } + } } } @@ -1043,27 +1036,25 @@ item_visible_set(Elm_Controlbar_Item *it, Eina_Bool visible) Elm_Controlbar_Item *item; Eina_Bool check = EINA_TRUE; - if(!it) return; - if (it->obj == NULL) - return; + if(!it || !it->obj) return; + Widget_Data * wd = elm_widget_data_get(it->obj); - if (!wd || !wd->items) - return; + if (!wd || !wd->items) return; if (it->order <= 0) check = EINA_FALSE; - if (check == visible) - return; + if (check == visible) return; if (visible) { - item = elm_controlbar_last_item_get(it->obj); - while(!elm_controlbar_item_visible_get(item)){ - item = elm_controlbar_item_prev(item); - } - item_insert_in_bar(it, item->order + 1); + item = elm_controlbar_last_item_get(it->obj); + while(!elm_controlbar_item_visible_get(item)) + { + item = elm_controlbar_item_prev(item); + } + item_insert_in_bar(it, item->order + 1); } else { - item_delete_in_bar(it); + item_delete_in_bar(it); } wd->items = eina_list_sort(wd->items, eina_list_count(wd->items), sort_cb); _sizing_eval(it->obj); @@ -1092,15 +1083,15 @@ item_exchange_in_bar(Elm_Controlbar_Item * it1, Elm_Controlbar_Item * it2) Widget_Data * wd = elm_widget_data_get(it1->obj); evas_object_geometry_get(wd->moving_item->edit, &x, &y, &w, &h); set_evas_map(wd->moving_obj, (wd->x + wd->w / 2), (wd->y + wd->h / 2), 0, - 0); + 0); evas_object_geometry_get(it1->base, &x, &y, &w, &h); evas_object_geometry_get(it2->base, &x_, &y_, &w_, &h_); wd->animating++; move_object_with_animation(it1->base, x, y, w, h, x_, y_, w_, h_, 0.25, - move_evas_map, item_exchange_animation_cb, wd); + move_evas_map, item_exchange_animation_cb, wd); wd->animating++; move_object_with_animation(it2->base, x_, y_, w_, h_, x, y, w, h, 0.25, - move_evas_map, item_exchange_animation_cb, wd); + move_evas_map, item_exchange_animation_cb, wd); elm_table_unpack(wd->box, it1->base); elm_table_unpack(wd->box, it2->base); order = it1->order; @@ -1108,13 +1099,13 @@ item_exchange_in_bar(Elm_Controlbar_Item * it1, Elm_Controlbar_Item * it2) it2->order = order; if(!wd->vertical) { - elm_table_pack(wd->box, it1->base, it1->order - 1, 0, 1, 1); - elm_table_pack(wd->box, it2->base, it2->order - 1, 0, 1, 1); + elm_table_pack(wd->box, it1->base, it1->order - 1, 0, 1, 1); + elm_table_pack(wd->box, it2->base, it2->order - 1, 0, 1, 1); } else { - elm_table_pack(wd->box, it1->base, 0, it1->order - 1, 1, 1); - elm_table_pack(wd->box, it2->base, 0, it2->order - 1, 1, 1); + elm_table_pack(wd->box, it1->base, 0, it1->order - 1, 1, 1); + elm_table_pack(wd->box, it2->base, 0, it2->order - 1, 1, 1); } } @@ -1126,8 +1117,8 @@ item_change_animation_cb(void *data, Evas_Object * obj) wd->animating--; if (wd->animating < 0) { - printf("animation error\n"); - wd->animating = 0; + printf("animation error\n"); + wd->animating = 0; } evas_object_map_enable_set(obj, EINA_FALSE); evas_object_geometry_get(obj, &x, &y, &w, &h); @@ -1144,10 +1135,8 @@ item_change_in_bar(Elm_Controlbar_Item * it) Evas_Coord x, y, w, h; Evas_Coord x_, y_, w_, h_; Widget_Data * wd = elm_widget_data_get(it->obj); - if (wd == NULL) - return; - if (wd->moving_item == NULL) - return; + if (!wd) return; + if (!wd->moving_item) return; evas_object_geometry_get(wd->moving_item->edit, &x, &y, &w, &h); set_evas_map(wd->moving_obj, x, y, w, h); elm_table_unpack(wd->box, it->base); @@ -1155,21 +1144,21 @@ item_change_in_bar(Elm_Controlbar_Item * it) it->order = 0; if(!wd->vertical) { - elm_table_pack(wd->box, wd->moving_item->base, wd->moving_item->order - 1, 0, 1, 1); + elm_table_pack(wd->box, wd->moving_item->base, wd->moving_item->order - 1, 0, 1, 1); } else { - elm_table_pack(wd->box, wd->moving_item->base, 0, wd->moving_item->order - 1, 1, 1); + elm_table_pack(wd->box, wd->moving_item->base, 0, wd->moving_item->order - 1, 1, 1); } evas_object_show(wd->moving_item->base); evas_render_updates_free(evas_render_updates - (evas_object_evas_get(wd->moving_item->base))); + (evas_object_evas_get(wd->moving_item->base))); evas_object_geometry_get(it->base, &x, &y, &w, &h); evas_object_geometry_get(it->edit, &x_, &y_, &w_, &h_); wd->animating++; move_object_with_animation(it->base, x, y, w, h, x_, y_, w_, h_, 0.25, - move_evas_map, item_change_animation_cb, wd); + move_evas_map, item_change_animation_cb, wd); evas_object_geometry_get(wd->moving_item->base, &x, &y, &w, &h); set_evas_map(wd->moving_item->base, x, y, w, h); } @@ -1187,29 +1176,29 @@ hide_selected_box(void *data) static void item_color_set(Elm_Controlbar_Item *item, const char *color_part) { - Evas_Object *color; - int r, g, b, a; + Evas_Object *color; + int r, g, b, a; - color = (Evas_Object *) edje_object_part_object_get(_EDJ(item->base), color_part); - if (color) - evas_object_color_get(color, &r, &g, &b, &a); - evas_object_color_set(item->label, r, g, b, a); - evas_object_color_set(item->icon, r, g, b, a); + color = (Evas_Object *) edje_object_part_object_get(_EDJ(item->base), color_part); + if (color) + evas_object_color_get(color, &r, &g, &b, &a); + evas_object_color_set(item->label, r, g, b, a); + evas_object_color_set(item->icon, r, g, b, a); } - static void +static void _end_selected_box(void *data, Evas_Object *obj) { Widget_Data * wd = (Widget_Data *)data; edje_object_signal_emit(_EDJ(wd->cur_item->base), wd->selected_signal, "elm"); edje_object_signal_emit(_EDJ(wd->cur_item->base_item), "elm,state,shadow_show", "elm"); - + wd->animating--; if (wd->animating < 0) { - printf("animation error\n"); - wd->animating = 0; + printf("animation error\n"); + wd->animating = 0; } ecore_idler_add(hide_selected_box, wd->selected_box); @@ -1218,25 +1207,25 @@ _end_selected_box(void *data, Evas_Object *obj) static void move_selected_box(Widget_Data *wd, Elm_Controlbar_Item * fit, Elm_Controlbar_Item * tit) { - Evas_Coord fx, fy, fw, fh, tx, ty, tw, th; - Evas_Object *from, *to; + Evas_Coord fx, fy, fw, fh, tx, ty, tw, th; + Evas_Object *from, *to; - if(fit->order <= 0 && wd->auto_align) - fit = wd->more_item; + if(fit->order <= 0 && wd->auto_align) + fit = wd->more_item; - from = (Evas_Object *)edje_object_part_object_get(_EDJ(fit->base), "bg_img"); - evas_object_geometry_get(from, &fx, &fy, &fw, &fh); + from = (Evas_Object *)edje_object_part_object_get(_EDJ(fit->base), "bg_img"); + evas_object_geometry_get(from, &fx, &fy, &fw, &fh); - to = (Evas_Object *)edje_object_part_object_get(_EDJ(tit->base), "bg_img"); - evas_object_geometry_get(to, &tx, &ty, &tw, &th); + to = (Evas_Object *)edje_object_part_object_get(_EDJ(tit->base), "bg_img"); + evas_object_geometry_get(to, &tx, &ty, &tw, &th); - edje_object_signal_emit(_EDJ(wd->pre_item->base), "elm,state,unselected", "elm"); - edje_object_signal_emit(_EDJ(wd->pre_item->base_item), "elm,state,shadow_hide", "elm"); - edje_object_signal_emit(_EDJ(wd->cur_item->base), "elm,state,unselected", "elm"); + edje_object_signal_emit(_EDJ(wd->pre_item->base), "elm,state,unselected", "elm"); + edje_object_signal_emit(_EDJ(wd->pre_item->base_item), "elm,state,shadow_hide", "elm"); + edje_object_signal_emit(_EDJ(wd->cur_item->base), "elm,state,unselected", "elm"); - wd->animating++; - move_object_with_animation(wd->selected_box, fx, fy, fw, fh, tx, ty, tw, th, - 0.3, move_evas_object, _end_selected_box, wd); + wd->animating++; + move_object_with_animation(wd->selected_box, fx, fy, fw, fh, tx, ty, tw, th, + 0.3, move_evas_object, _end_selected_box, wd); } static void @@ -1247,7 +1236,7 @@ end_selected_box(void *data, Evas_Object *obj) if(wd->pre_item) evas_object_hide(wd->pre_item->view); elm_layout_content_set(wd->view, "elm.swallow.view", obj); - + evas_object_show(obj); } @@ -1278,9 +1267,10 @@ end_view_animation_effect(void *data, Evas_Object *obj) { Widget_Data *wd = (Widget_Data *)data; elm_xml_animator_object_del(wd->vxa, obj); - if(wd->pre_item) { - evas_object_hide(wd->pre_item->view); - } + if(wd->pre_item) + { + evas_object_hide(wd->pre_item->view); + } //if(wd->cur_item) elm_layout_content_set(wd->view, "elm.swallow.view", wd->cur_item->view); } @@ -1296,35 +1286,39 @@ selected_box(Elm_Controlbar_Item * it) wd->cur_item = it; - if(!wd->vxa){ - wd->vxa = elm_xml_animator_add(wd->object); - elm_xml_animator_file_set(wd->vxa, "/usr/share/xmls/elementary.xml"); - } - - if(it->style == TABBAR){ - - content = elm_layout_content_unset(wd->view, "elm.swallow.view"); - EINA_LIST_FOREACH(wd->items, l, item){ - if(item->selected) { - fit = item; - wd->pre_item = fit; - } - item->selected = EINA_FALSE; - } - it->selected = EINA_TRUE; + if(!wd->vxa) + { + wd->vxa = elm_xml_animator_add(wd->object); + elm_xml_animator_file_set(wd->vxa, "/usr/share/xmls/elementary.xml"); + } - if(wd->more_item != it) - evas_object_smart_callback_call(it->obj, "view,change,before", it); + if(it->style == TABBAR) + { - if(fit != NULL && fit != it) - { - move_selected_box(wd, fit, it); - } - else - { - edje_object_signal_emit(_EDJ(it->base), wd->selected_signal, "elm"); - edje_object_signal_emit(_EDJ(wd->cur_item->base_item), "elm,state,shadow_show", "elm"); - } + content = elm_layout_content_unset(wd->view, "elm.swallow.view"); + EINA_LIST_FOREACH(wd->items, l, item) + { + if(item->selected) + { + fit = item; + wd->pre_item = fit; + } + item->selected = EINA_FALSE; + } + it->selected = EINA_TRUE; + + if(wd->more_item != it) + evas_object_smart_callback_call(it->obj, "view,change,before", it); + + if(fit != NULL && fit != it) + { + move_selected_box(wd, fit, it); + } + else + { + edje_object_signal_emit(_EDJ(it->base), wd->selected_signal, "elm"); + edje_object_signal_emit(_EDJ(wd->cur_item->base_item), "elm,state,shadow_show", "elm"); + } /* if(fit != NULL && fit != it) @@ -1357,16 +1351,17 @@ selected_box(Elm_Controlbar_Item * it) //evas_object_resize(it->view, 480, 620); //evas_object_show(it->view); - if(wd->pre_item && wd->pre_item != it) - { - if(wd->view_hide) - elm_xml_animator_object_add(wd->vxa, wd->pre_item->view, wd->view_hide, end_view_animation_effect, wd); - else - evas_object_hide(wd->pre_item->view); - if(wd->view_show) { - elm_xml_animator_object_add(wd->vxa, it->view, wd->view_show, end_view_animation_effect, wd); - } - } + if(wd->pre_item && wd->pre_item != it) + { + if(wd->view_hide) + elm_xml_animator_object_add(wd->vxa, wd->pre_item->view, wd->view_hide, end_view_animation_effect, wd); + else + evas_object_hide(wd->pre_item->view); + if(wd->view_show) + { + elm_xml_animator_object_add(wd->vxa, it->view, wd->view_show, end_view_animation_effect, wd); + } + } elm_xml_animator_run(wd->vxa); @@ -1374,13 +1369,15 @@ selected_box(Elm_Controlbar_Item * it) //edje_object_part_swallow(wd->view, "elm.swallow.view", it->view); // evas_object_show(it->view); - }else if(it->style == TOOLBAR){ - if (it->func) - { - it->func(it->data, it->obj, it); - } - if(item_exist_check(wd, it)) edje_object_signal_emit(_EDJ(it->base), "elm,state,text_unselected", "elm"); - } + } + else if(it->style == TOOLBAR) + { + if (it->func) + { + it->func(it->data, it->obj, it); + } + if(item_exist_check(wd, it)) edje_object_signal_emit(_EDJ(it->base), "elm,state,text_unselected", "elm"); + } if(item_exist_check(wd, it)) evas_object_smart_callback_call(it->obj, "clicked", it); } @@ -1398,35 +1395,35 @@ unpressed_box_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info) EINA_LIST_FOREACH(wd->items, l, item) { - if (item->style == TABBAR) - { - if(item->selected) - { - edje_object_signal_emit(_EDJ(item->base), wd->selected_signal, "elm"); - } - else - { - edje_object_signal_emit(_EDJ(item->base), "elm,state,unselected", "elm"); - edje_object_signal_emit(_EDJ(item->base_item), "elm,state,shadow_hide", "elm"); - } - } - else if (item->style == TOOLBAR) - { - if(!item->disable) - { - edje_object_signal_emit(_EDJ(item->base), "elm,state,unselected", "elm"); - //item_color_set(item, "elm.item.default.color"); - } - } + if (item->style == TABBAR) + { + if(item->selected) + { + edje_object_signal_emit(_EDJ(item->base), wd->selected_signal, "elm"); + } + else + { + edje_object_signal_emit(_EDJ(item->base), "elm,state,unselected", "elm"); + edje_object_signal_emit(_EDJ(item->base_item), "elm,state,shadow_hide", "elm"); + } + } + else if (item->style == TOOLBAR) + { + if(!item->disable) + { + edje_object_signal_emit(_EDJ(item->base), "elm,state,unselected", "elm"); + //item_color_set(item, "elm.item.default.color"); + } + } } if(item_exist_check(wd, wd->pre_item)) { - evas_object_geometry_get(wd->pre_item->base, &x, &y, &w, &h); - if(ev->output.x > x && ev->output.x < x+w && ev->output.y > y && ev->output.y < y+h) - { - selected_box(wd->pre_item); - } + evas_object_geometry_get(wd->pre_item->base, &x, &y, &w, &h); + if(ev->output.x > x && ev->output.x < x+w && ev->output.y > y && ev->output.y < y+h) + { + selected_box(wd->pre_item); + } } return; } @@ -1438,33 +1435,33 @@ pressed_box(Elm_Controlbar_Item * it) int check = 0; const Eina_List *l; Elm_Controlbar_Item * item; - + if(wd->animating) return EXIT_FAILURE; if(it->disable) return EXIT_FAILURE; EINA_LIST_FOREACH(wd->items, l, item) - { - if (it == item) - { - if (it->style == TABBAR) - { - edje_object_signal_emit(_EDJ(it->base), wd->pressed_signal, "elm"); - } - else if (it->style == TOOLBAR) - { - - if(!it->disable) - { - edje_object_signal_emit(_EDJ(it->base), "elm,state,toolbar_pressed", "elm"); - //item_color_set(it, "elm.toolbar.pressed.color"); - } - } - evas_object_event_callback_add(wd->event_box, EVAS_CALLBACK_MOUSE_UP, unpressed_box_cb, (void *)wd); - - check = EINA_TRUE; - } - } + { + if (it == item) + { + if (it->style == TABBAR) + { + edje_object_signal_emit(_EDJ(it->base), wd->pressed_signal, "elm"); + } + else if (it->style == TOOLBAR) + { + + if(!it->disable) + { + edje_object_signal_emit(_EDJ(it->base), "elm,state,toolbar_pressed", "elm"); + //item_color_set(it, "elm.toolbar.pressed.color"); + } + } + evas_object_event_callback_add(wd->event_box, EVAS_CALLBACK_MOUSE_UP, unpressed_box_cb, (void *)wd); + + check = EINA_TRUE; + } + } if (!check) return EXIT_FAILURE; @@ -1498,15 +1495,15 @@ create_item_icon(Evas_Object *obj, Elm_Controlbar_Item * it, char *part) icon = elm_icon_add(obj); if(!elm_icon_standard_set(icon, it->icon_path)) { - elm_icon_file_set(icon, it->icon_path, NULL); + elm_icon_file_set(icon, it->icon_path, NULL); } evas_object_size_hint_min_set(icon, 40, 40); evas_object_size_hint_max_set(icon, 100, 100); evas_object_show(icon); if(obj && part) - elm_layout_content_set(obj, part, icon); - + elm_layout_content_set(obj, part, icon); + return icon; } @@ -1517,45 +1514,45 @@ create_item_layout(Evas_Object * parent, Elm_Controlbar_Item * it, Evas_Object * obj = elm_layout_add(parent); if (obj == NULL) { - fprintf(stderr, "Cannot load bg edj\n"); - return NULL; + fprintf(stderr, "Cannot load bg edj\n"); + return NULL; } elm_layout_theme_set(obj, "controlbar", "item_bg", - elm_widget_style_get(it->obj)); + elm_widget_style_get(it->obj)); evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL); *item = elm_layout_add(parent); if (*item == NULL) { - fprintf(stderr, "Cannot load bg edj\n"); - return NULL; + fprintf(stderr, "Cannot load bg edj\n"); + return NULL; } elm_layout_theme_set(*item, "controlbar", "item", - elm_widget_style_get(it->obj)); + elm_widget_style_get(it->obj)); elm_layout_content_set(obj, "item", *item); if (it->text) { - *label = create_item_label(*item, it, "elm.swallow.text"); - *slabel = create_item_label(*item, it, "elm.swallow.text_shadow"); - evas_object_color_set(*slabel, 0, 0, 0, 255); + *label = create_item_label(*item, it, "elm.swallow.text"); + *slabel = create_item_label(*item, it, "elm.swallow.text_shadow"); + evas_object_color_set(*slabel, 0, 0, 0, 255); } if (it->icon_path) { - *icon = create_item_icon(*item, it, "elm.swallow.icon"); - *sicon = create_item_icon(*item, it, "elm.swallow.icon_shadow"); - evas_object_color_set(*sicon, 0, 0, 0, 255); + *icon = create_item_icon(*item, it, "elm.swallow.icon"); + *sicon = create_item_icon(*item, it, "elm.swallow.icon_shadow"); + evas_object_color_set(*sicon, 0, 0, 0, 255); } if (*label && *icon) { - edje_object_signal_emit(_EDJ(*item), "elm,state,icon_text", "elm"); - elm_label_line_wrap_set(*label, EINA_FALSE); - elm_label_wrap_mode_set(*label, 0); - elm_label_line_wrap_set(*slabel, EINA_FALSE); - elm_label_wrap_mode_set(*slabel, 0); + edje_object_signal_emit(_EDJ(*item), "elm,state,icon_text", "elm"); + elm_label_line_wrap_set(*label, EINA_FALSE); + elm_label_wrap_mode_set(*label, 0); + elm_label_line_wrap_set(*slabel, EINA_FALSE); + elm_label_wrap_mode_set(*slabel, 0); } - + return obj; } @@ -1599,8 +1596,7 @@ edit_item_move_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info) Elm_Controlbar_Item * item; Evas_Coord x, y, w, h; Widget_Data * wd = (Widget_Data *) data; - if (wd->animating) - return; + if (wd->animating) return; evas_object_geometry_get(wd->moving_obj, &x, &y, &w, &h); w *= 2.0; h *= 2.0; @@ -1616,13 +1612,11 @@ edit_item_move_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info) if (ev->cur.output.x > x && ev->cur.output.x < x + w && ev->cur.output.y > y && ev->cur.output.y < y + h && item->editable) { - edje_object_signal_emit(_EDJ(item->base), "elm,state,show,glow", - "elm"); + edje_object_signal_emit(_EDJ(item->base), "elm,state,show,glow", "elm"); } else { - edje_object_signal_emit(_EDJ(item->base), "elm,state,hide,glow", - "elm"); + edje_object_signal_emit(_EDJ(item->base), "elm,state,hide,glow", "elm"); } } return; @@ -1642,52 +1636,51 @@ edit_item_up_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info) return; evas_object_color_set(wd->moving_item->edit_item, 255, 255, 255, 255); - // check which change or not - EINA_LIST_FOREACH(wd->items, l, item) - { - if (wd->moving_item->edit == item->edit) - continue; - if (item->order <= 0) - continue; - evas_object_geometry_get(item->base, &x, &y, &w, &h); - if (ev->output.x > x && ev->output.x < x + w && ev->output.y > y && ev->output.y < y + h - && item->style != OBJECT && item->editable) - { - edje_object_signal_emit(_EDJ(item->base), "elm,state,hide,glow", - "elm"); - break; - } - } + // check which change or not + EINA_LIST_FOREACH(wd->items, l, item) + { + if (wd->moving_item->edit == item->edit) + continue; + if (item->order <= 0) + continue; + evas_object_geometry_get(item->base, &x, &y, &w, &h); + if (ev->output.x > x && ev->output.x < x + w && ev->output.y > y && ev->output.y < y + h + && item->style != OBJECT && item->editable) + { + edje_object_signal_emit(_EDJ(item->base), "elm,state,hide,glow", + "elm"); + break; + } + } if (item != NULL) { - if (wd->moving_item->order > 0) - { - item_exchange_in_bar(wd->moving_item, item); - } - else - { - item_change_in_bar(item); - } - evas_object_event_callback_del(wd->event_box, EVAS_CALLBACK_MOUSE_UP, edit_item_up_cb); - evas_object_event_callback_del(wd->event_box, EVAS_CALLBACK_MOUSE_MOVE, edit_item_move_cb); + if (wd->moving_item->order > 0) + { + item_exchange_in_bar(wd->moving_item, item); + } + else + { + item_change_in_bar(item); + } + evas_object_event_callback_del(wd->event_box, EVAS_CALLBACK_MOUSE_UP, edit_item_up_cb); + evas_object_event_callback_del(wd->event_box, EVAS_CALLBACK_MOUSE_MOVE, edit_item_move_cb); } else { - - // return moving object to original location - evas_object_geometry_get(wd->moving_item->edit, &x_, &y_, &w_, - &h_); - evas_object_geometry_get(wd->moving_obj, &x, &y, &w, &h); - w *= 2.0; - h *= 2.0; - x = ev->output.x - w / 2; - y = ev->output.y - h; - evas_object_data_set(wd->moving_obj, "returning", (void *)1); - wd->animating++; - move_object_with_animation(wd->moving_obj, x, y, w, h, x_, y_, w_, h_, - 0.25, move_evas_map, edit_item_return_cb, wd); + + // return moving object to original location + evas_object_geometry_get(wd->moving_item->edit, &x_, &y_, &w_, + &h_); + evas_object_geometry_get(wd->moving_obj, &x, &y, &w, &h); + w *= 2.0; + h *= 2.0; + x = ev->output.x - w / 2; + y = ev->output.y - h; + evas_object_data_set(wd->moving_obj, "returning", (void *)1); + wd->animating++; + move_object_with_animation(wd->moving_obj, x, y, w, h, x_, y_, w_, h_, + 0.25, move_evas_map, edit_item_return_cb, wd); } - return; } static void @@ -1704,17 +1697,14 @@ edit_item_down_cb(void *data, Evas * evas, Evas_Object * obj, Evas_Object * color; int r, g, b, a; - if (wd->animating) - return; + if (wd->animating) return; EINA_LIST_FOREACH(wd->items, l, item) - { - if (item->edit == obj) - break; - } - if (item == NULL) - return; - if (!item->editable) - return; + { + if (item->edit == obj) + break; + } + + if (!item || !item->editable) return; evas_object_event_callback_add(wd->event_box, EVAS_CALLBACK_MOUSE_UP, edit_item_up_cb, (void *)wd); evas_object_event_callback_add(wd->event_box, EVAS_CALLBACK_MOUSE_MOVE, edit_item_move_cb, (void *)wd); @@ -1741,7 +1731,7 @@ edit_item_down_cb(void *data, Evas * evas, Evas_Object * obj, y_ = ev->output.y - h_; wd->animating++; move_object_with_animation(wd->moving_obj, x, y, w, h, x_, y_, w_, h_, 0.1, - move_evas_map, edit_item_down_end_cb, wd); + move_evas_map, edit_item_down_end_cb, wd); } static void @@ -1752,15 +1742,15 @@ bar_item_move_end_cb(void *data, Evas_Object * obj) Elm_Controlbar_Item * item; EINA_LIST_FOREACH(wd->items, l, item) - { - if (item->base == obj) - break; - } + { + if (item->base == obj) + break; + } wd->animating--; if (wd->animating < 0) { - printf("animation error\n"); - wd->animating = 0; + printf("animation error\n"); + wd->animating = 0; } evas_object_data_set(obj, "animating", 0); evas_object_map_enable_set(obj, EINA_FALSE); @@ -1773,22 +1763,21 @@ bar_item_animation_end_check(void *data) Elm_Controlbar_Item * item; Widget_Data * wd = (Widget_Data *) data; - if (wd->animating) - return EXIT_FAILURE; + if (wd->animating) return EXIT_FAILURE; EINA_LIST_FOREACH(wd->items, l, item) - { - if (item->base == wd->moving_obj) - break; - } + { + if (item->base == wd->moving_obj) + break; + } if (item == NULL) { - printf("item is NULL\n"); + printf("item is NULL\n"); } else { - item->order = wd->empty_num; - wd->empty_num = 0; - wd->moving_obj = NULL; + item->order = wd->empty_num; + wd->empty_num = 0; + wd->moving_obj = NULL; } evas_object_event_callback_del(wd->event_box, EVAS_CALLBACK_MOUSE_UP, bar_item_up_cb); evas_object_event_callback_del(wd->event_box, EVAS_CALLBACK_MOUSE_MOVE, bar_item_move_cb); @@ -1877,28 +1866,26 @@ bar_item_down_cb(void *data, Evas * evas, Evas_Object * obj, void *event_info) Widget_Data * wd = (Widget_Data *) data; const Eina_List *l; Elm_Controlbar_Item * item; - if (wd->animating) - return; + if (wd->animating) return; EINA_LIST_FOREACH(wd->items, l, item) - { - if (item->base == obj) - break; - } - if (item == NULL) - return; + { + if (item->base == obj) + break; + } + if (!item) return; if (wd->edit_mode) { - if (!item->editable) - return; + if (!item->editable) + return; - wd->moving_obj = obj; - wd->empty_num = item->order; - evas_object_event_callback_add(wd->event_box, EVAS_CALLBACK_MOUSE_UP, bar_item_up_cb, (void *)wd); - evas_object_event_callback_add(wd->event_box, EVAS_CALLBACK_MOUSE_MOVE, bar_item_move_cb, (void *)wd); + wd->moving_obj = obj; + wd->empty_num = item->order; + evas_object_event_callback_add(wd->event_box, EVAS_CALLBACK_MOUSE_UP, bar_item_up_cb, (void *)wd); + evas_object_event_callback_add(wd->event_box, EVAS_CALLBACK_MOUSE_MOVE, bar_item_move_cb, (void *)wd); } else { - pressed_box(item); + pressed_box(item); } } @@ -1910,18 +1897,17 @@ create_tab_item(Evas_Object * obj, const char *icon_path, const char *label, Widget_Data * wd; if (obj == NULL) { - fprintf(stderr, "Invalid argument: controlbar object is NULL\n"); - return NULL; + fprintf(stderr, "Invalid argument: controlbar object is NULL\n"); + return NULL; } wd = elm_widget_data_get(obj); if (wd == NULL) { - fprintf(stderr, "Cannot get smart data\n"); - return NULL; + fprintf(stderr, "Cannot get smart data\n"); + return NULL; } it = ELM_NEW(Elm_Controlbar_Item); - if (it == NULL) - return NULL; + if (!it) return NULL; it->obj = obj; it->text = eina_stringshare_add(label); it->icon_path = eina_stringshare_add(icon_path); @@ -1933,11 +1919,11 @@ create_tab_item(Evas_Object * obj, const char *icon_path, const char *label, it->style = TABBAR; it->base = create_item_layout(wd->edje, it, &(it->base_item), &(it->label), &(it->icon), &(it->icon_shadow), &(it->label_shadow)); evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_DOWN, - bar_item_down_cb, wd); + bar_item_down_cb, wd); evas_object_show(it->base); it->edit = create_item_layout(wd->edje, it, &(it->edit_item), &(it->edit_label), &(it->edit_icon), &(it->edit_icon_shadow), &(it->edit_label_shadow)); evas_object_event_callback_add(it->edit, EVAS_CALLBACK_MOUSE_DOWN, - edit_item_down_cb, wd); + edit_item_down_cb, wd); evas_object_show(it->edit); return it; @@ -1952,18 +1938,17 @@ create_tool_item(Evas_Object * obj, const char *icon_path, const char *label, Widget_Data * wd; if (obj == NULL) { - fprintf(stderr, "Invalid argument: controlbar object is NULL\n"); - return NULL; + fprintf(stderr, "Invalid argument: controlbar object is NULL\n"); + return NULL; } wd = elm_widget_data_get(obj); if (wd == NULL) { - fprintf(stderr, "Cannot get smart data\n"); - return NULL; + fprintf(stderr, "Cannot get smart data\n"); + return NULL; } it = ELM_NEW(Elm_Controlbar_Item); - if (it == NULL) - return NULL; + if (!it) return NULL; it->obj = obj; it->text = eina_stringshare_add(label); it->icon_path = eina_stringshare_add(icon_path); @@ -1976,11 +1961,11 @@ create_tool_item(Evas_Object * obj, const char *icon_path, const char *label, it->style = TOOLBAR; it->base = create_item_layout(wd->edje, it, &(it->base_item), &(it->label), &(it->icon), &(it->icon_shadow), &(it->label_shadow)); evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_DOWN, - bar_item_down_cb, wd); + bar_item_down_cb, wd); evas_object_show(it->base); it->edit = create_item_layout(wd->edje, it, &(it->edit_item), &(it->edit_label), &(it->edit_icon), &(it->edit_icon_shadow), &(it->edit_label_shadow)); evas_object_event_callback_add(it->edit, EVAS_CALLBACK_MOUSE_DOWN, - edit_item_down_cb, wd); + edit_item_down_cb, wd); evas_object_show(it->edit); return it; } @@ -1992,14 +1977,14 @@ create_object_item(Evas_Object * obj, Evas_Object * obj_item, const int sel) Widget_Data * wd; if (obj == NULL) { - fprintf(stderr, "Invalid argument: controlbar object is NULL\n"); - return NULL; + fprintf(stderr, "Invalid argument: controlbar object is NULL\n"); + return NULL; } wd = elm_widget_data_get(obj); if (wd == NULL) { - fprintf(stderr, "Cannot get smart data\n"); - return NULL; + fprintf(stderr, "Cannot get smart data\n"); + return NULL; } it = ELM_NEW(Elm_Controlbar_Item); if (it == NULL) @@ -2020,18 +2005,18 @@ repack_items(Widget_Data *wd) EINA_LIST_FOREACH(wd->items, l, item) { - if(item->order > 0) - { - elm_table_unpack(wd->box, item->base); - if(!wd->vertical) - { - elm_table_pack(wd->box, item->base, item->order - 1, 0, item->sel, 1); - } - else - { - elm_table_pack(wd->box, item->base, 0, item->order - 1, item->sel, 1); - } - } + if(item->order > 0) + { + elm_table_unpack(wd->box, item->base); + if(!wd->vertical) + { + elm_table_pack(wd->box, item->base, item->order - 1, 0, item->sel, 1); + } + else + { + elm_table_pack(wd->box, item->base, 0, item->order - 1, item->sel, 1); + } + } } } @@ -2041,14 +2026,10 @@ set_items_position(Evas_Object * obj, Elm_Controlbar_Item * it, { Widget_Data * wd; const Eina_List *l; - Elm_Controlbar_Item * item; int i = 1; - int check = EINA_FALSE; - int edit = 1; - int order = 1; if (obj == NULL) @@ -2073,54 +2054,55 @@ set_items_position(Evas_Object * obj, Elm_Controlbar_Item * it, } if (check) { - if(item->order > 0){ - elm_table_unpack(wd->box, item->base); - item->order += it->sel; - if(!wd->vertical) - { - elm_table_pack(wd->box, item->base, item->order - 1, 0, item->sel, 1); - } - else - { - elm_table_pack(wd->box, item->base, 0, item->order - 1, item->sel, 1); - } - } - if (item->style != OBJECT && it->style != OBJECT) - { - elm_table_unpack(wd->edit_table, item->edit); - elm_table_pack(wd->edit_table, item->edit, - i % EDIT_ROW_NUM, i / EDIT_ROW_NUM, 1, 1); - } - } + if(item->order > 0) + { + elm_table_unpack(wd->box, item->base); + item->order += it->sel; + if(!wd->vertical) + { + elm_table_pack(wd->box, item->base, item->order - 1, 0, item->sel, 1); + } + else + { + elm_table_pack(wd->box, item->base, 0, item->order - 1, item->sel, 1); + } + } + if (item->style != OBJECT && it->style != OBJECT) + { + elm_table_unpack(wd->edit_table, item->edit); + elm_table_pack(wd->edit_table, item->edit, + i % EDIT_ROW_NUM, i / EDIT_ROW_NUM, 1, 1); + } + } if (item->style != OBJECT) - i++; + i++; if(item->order > 0) order += item->sel; } if (!check) { - edit = i; - if(bar) - it->order = order; - else - it->order = 0; + edit = i; + if(bar) + it->order = order; + else + it->order = 0; } wd->num++; - + if(bar) { - if(!wd->vertical) - { - elm_table_pack(wd->box, it->base, it->order - 1, 0, it->sel, 1); - } - else - { - elm_table_pack(wd->box, it->base, 0, it->order - 1, it->sel, 1); - } + if(!wd->vertical) + { + elm_table_pack(wd->box, it->base, it->order - 1, 0, it->sel, 1); + } + else + { + elm_table_pack(wd->box, it->base, 0, it->order - 1, it->sel, 1); + } } else evas_object_hide(it->base); if (it->style != OBJECT) elm_table_pack(wd->edit_table, it->edit, (edit - 1) % EDIT_ROW_NUM, - (edit - 1) / EDIT_ROW_NUM, 1, 1); + (edit - 1) / EDIT_ROW_NUM, 1, 1); } static void @@ -2132,7 +2114,7 @@ list_clicked(void *data, Evas_Object *obj, void *event_info) Widget_Data *wd; Evas_Object *content; Elm_List_Item *lit = (Elm_List_Item *) elm_list_selected_item_get(obj); - if(lit == NULL) return; + if(!lit) return; elm_list_item_selected_set(lit, 0); @@ -2166,7 +2148,7 @@ create_more_view(Widget_Data *wd) const Eina_List *l; Evas_Object *icon; - list = elm_list_add( wd->object ); + list = elm_list_add(wd->object); elm_list_horizontal_mode_set( list, ELM_LIST_COMPRESS ); EINA_LIST_FOREACH(wd->items, l, item) @@ -2306,7 +2288,8 @@ create_more_item(Widget_Data *wd, int style) * * @ingroup Controlbar */ - EAPI Evas_Object * elm_controlbar_add(Evas_Object * parent) +EAPI Evas_Object * +elm_controlbar_add(Evas_Object * parent) { Evas_Object * obj = NULL; Evas_Object * bg = NULL; @@ -2315,11 +2298,9 @@ create_more_item(Widget_Data *wd, int style) Evas_Object * r_button; wd = ELM_NEW(Widget_Data); wd->evas = evas_object_evas_get(parent); - if (wd->evas == NULL) - return NULL; + if (!wd->evas == NULL) return NULL; obj = elm_widget_add(wd->evas); - if (obj == NULL) - return NULL; + if (!obj) return NULL; ELM_SET_WIDTYPE(widtype, "controlbar"); elm_widget_type_set(obj, "controlbar"); elm_widget_sub_object_add(parent, obj); @@ -2388,7 +2369,7 @@ create_more_item(Widget_Data *wd, int style) /* load background edj */ wd->edje = edje_object_add(wd->evas); _elm_theme_object_set(obj, wd->edje, "controlbar", "base", "default"); - if (wd->edje == NULL) + if (!wd->edje) { printf("Cannot load base edj\n"); return NULL; @@ -2397,7 +2378,7 @@ create_more_item(Widget_Data *wd, int style) wd->bg = edje_object_add(wd->evas); _elm_theme_object_set(obj, wd->bg, "controlbar", "background", "default"); - if (wd->bg == NULL) + if (!wd->bg) { printf("Cannot load bg edj\n"); return NULL; @@ -2406,13 +2387,13 @@ create_more_item(Widget_Data *wd, int style) // initialization evas_object_event_callback_add(wd->edje, EVAS_CALLBACK_RESIZE, - _controlbar_object_resize, obj); + _controlbar_object_resize, obj); evas_object_event_callback_add(wd->edje, EVAS_CALLBACK_MOVE, - _controlbar_object_move, obj); + _controlbar_object_move, obj); evas_object_event_callback_add(wd->edje, EVAS_CALLBACK_SHOW, - _controlbar_object_show, obj); + _controlbar_object_show, obj); evas_object_event_callback_add(wd->edje, EVAS_CALLBACK_HIDE, - _controlbar_object_hide, obj); + _controlbar_object_hide, obj); bg = (Evas_Object *)edje_object_part_object_get(wd->edje, "bg_image"); evas_object_event_callback_add(bg, EVAS_CALLBACK_MOVE, _controlbar_object_move, obj); evas_object_event_callback_add(bg, EVAS_CALLBACK_RESIZE, _controlbar_object_resize, obj); @@ -2429,22 +2410,22 @@ create_more_item(Widget_Data *wd, int style) _elm_theme_object_set(obj, wd->focused_box_right, "controlbar", "item_bg_move_right", "default"); evas_object_hide(wd->focused_box_right); - // items container + // items container wd->box = elm_table_add(wd->edje); elm_table_homogenous_set(wd->box, EINA_TRUE); evas_object_size_hint_weight_set(wd->box, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); + EVAS_HINT_EXPAND); evas_object_size_hint_align_set(wd->box, EVAS_HINT_FILL, EVAS_HINT_FILL); edje_object_part_swallow(wd->edje, "elm.swallow.items", wd->box); evas_object_show(wd->box); - + wd->event_box = evas_object_rectangle_add(wd->evas); evas_object_color_set(wd->event_box, 255, 255, 255, 0); evas_object_repeat_events_set(wd->event_box, EINA_TRUE); evas_object_show(wd->event_box); evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); - + evas_object_smart_member_add(wd->view, obj); evas_object_smart_member_add(wd->edit_box, obj); elm_widget_resize_object_set(obj, wd->edje); @@ -2453,7 +2434,7 @@ create_more_item(Widget_Data *wd, int style) evas_object_smart_member_add(wd->focused_box_right, obj); evas_object_smart_member_add(wd->box, obj); evas_object_smart_member_add(wd->event_box, obj); - + _sizing_eval(obj); return obj; } @@ -2469,36 +2450,36 @@ create_more_item(Widget_Data *wd, int style) * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * elm_controlbar_tab_item_append(Evas_Object * obj, - const char - *icon_path, - const char *label, - Evas_Object * - view) +EAPI Elm_Controlbar_Item * +elm_controlbar_tab_item_append(Evas_Object * obj, + const char *icon_path, + const char *label, + Evas_Object *view) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Elm_Controlbar_Item * it; Elm_Controlbar_Item * lit; Widget_Data * wd; it = create_tab_item(obj, icon_path, label, view); - if (it == NULL) - return NULL; + if (!it == NULL) return NULL; wd = elm_widget_data_get(obj); - if(check_bar_item_number(wd) >= 5 && wd->auto_align){ - if(!wd->more_item) { - lit = elm_controlbar_last_item_get(obj); - item_visible_set(lit, EINA_FALSE); - create_more_item(wd, TABBAR); - } - set_items_position(obj, it, NULL, EINA_FALSE); - } - else{ - set_items_position(obj, it, NULL, EINA_TRUE); - } + if(check_bar_item_number(wd) >= 5 && wd->auto_align) + { + if(!wd->more_item) { + lit = elm_controlbar_last_item_get(obj); + item_visible_set(lit, EINA_FALSE); + create_more_item(wd, TABBAR); + } + set_items_position(obj, it, NULL, EINA_FALSE); + } + else + { + set_items_position(obj, it, NULL, EINA_TRUE); + } if(wd->init_animation) evas_object_hide(it->base); wd->items = eina_list_append(wd->items, it); if(wd->more_item) - elm_controlbar_item_view_set(wd->more_item, create_more_view(wd)); + elm_controlbar_item_view_set(wd->more_item, create_more_view(wd)); if (wd->num == 1) selected_box(it); @@ -2517,14 +2498,11 @@ create_more_item(Widget_Data *wd, int style) * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * elm_controlbar_tab_item_prepend(Evas_Object * - obj, - const char - *icon_path, - const char - *label, - Evas_Object * - view) +EAPI Elm_Controlbar_Item * +elm_controlbar_tab_item_prepend(Evas_Object *obj, + const char *icon_path, + const char *label, + Evas_Object *view) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data * wd; @@ -2532,26 +2510,28 @@ create_more_item(Widget_Data *wd, int style) Elm_Controlbar_Item * lit; Elm_Controlbar_Item * item; it = create_tab_item(obj, icon_path, label, view); - if (it == NULL) - return NULL; + if (!it == NULL) return NULL; wd = elm_widget_data_get(obj); item = eina_list_data_get(wd->items); - if(check_bar_item_number(wd) >= 5 && wd->auto_align){ - if(!wd->more_item) { - lit = elm_controlbar_last_item_get(obj); - item_visible_set(lit, EINA_FALSE); - create_more_item(wd, TABBAR); - } - lit = elm_controlbar_item_prev(wd->more_item); - item_visible_set(lit, EINA_FALSE); - set_items_position(obj, it, item, EINA_TRUE); - } - else{ - set_items_position(obj, it, item, EINA_TRUE); - } + if(check_bar_item_number(wd) >= 5 && wd->auto_align) + { + if(!wd->more_item) + { + lit = elm_controlbar_last_item_get(obj); + item_visible_set(lit, EINA_FALSE); + create_more_item(wd, TABBAR); + } + lit = elm_controlbar_item_prev(wd->more_item); + item_visible_set(lit, EINA_FALSE); + set_items_position(obj, it, item, EINA_TRUE); + } + else + { + set_items_position(obj, it, item, EINA_TRUE); + } wd->items = eina_list_prepend(wd->items, it); if(wd->more_item) - elm_controlbar_item_view_set(wd->more_item, create_more_view(wd)); + elm_controlbar_item_view_set(wd->more_item, create_more_view(wd)); if (wd->num == 1) selected_box(it); _sizing_eval(obj); @@ -2570,47 +2550,48 @@ create_more_item(Widget_Data *wd, int style) * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * +EAPI Elm_Controlbar_Item * elm_controlbar_tab_item_insert_before(Evas_Object * obj, Elm_Controlbar_Item * before, const char *icon_path, - const char *label, Evas_Object * view) + const char *label, + Evas_Object * view) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data * wd; Elm_Controlbar_Item * it; Elm_Controlbar_Item * lit; - if (!before) - return NULL; + if (!before) return NULL; it = create_tab_item(obj, icon_path, label, view); - if (it == NULL) - return NULL; + if (!it) return NULL; wd = elm_widget_data_get(obj); - if(check_bar_item_number(wd) >= 5 && wd->auto_align){ - if(!wd->more_item) - { - lit = elm_controlbar_last_item_get(obj); - item_visible_set(lit, EINA_FALSE); - create_more_item(wd, TABBAR); - } - before = wd->more_item; - if(before->order > 0) - { - lit = elm_controlbar_item_prev(wd->more_item); - item_visible_set(lit, EINA_FALSE); - set_items_position(obj, it, before, EINA_TRUE); - } - else - { - set_items_position(obj, it, before, EINA_FALSE); - } - } - else{ - set_items_position(obj, it, before, EINA_TRUE); - } + if(check_bar_item_number(wd) >= 5 && wd->auto_align) + { + if(!wd->more_item) + { + lit = elm_controlbar_last_item_get(obj); + item_visible_set(lit, EINA_FALSE); + create_more_item(wd, TABBAR); + } + before = wd->more_item; + if(before->order > 0) + { + lit = elm_controlbar_item_prev(wd->more_item); + item_visible_set(lit, EINA_FALSE); + set_items_position(obj, it, before, EINA_TRUE); + } + else + { + set_items_position(obj, it, before, EINA_FALSE); + } + } + else + { + set_items_position(obj, it, before, EINA_TRUE); + } wd->items = eina_list_prepend_relative(wd->items, it, before); if(wd->more_item) - elm_controlbar_item_view_set(wd->more_item, create_more_view(wd)); + elm_controlbar_item_view_set(wd->more_item, create_more_view(wd)); if (wd->num == 1) selected_box(it); _sizing_eval(obj); @@ -2629,48 +2610,49 @@ elm_controlbar_tab_item_insert_before(Evas_Object * obj, * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * +EAPI Elm_Controlbar_Item * elm_controlbar_tab_item_insert_after(Evas_Object * obj, Elm_Controlbar_Item * after, - const char *icon_path, const char *label, - Evas_Object * view) + const char *icon_path, + const char *label, + Evas_Object * view) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data * wd; Elm_Controlbar_Item * it; Elm_Controlbar_Item * lit; Elm_Controlbar_Item * item; - if (!after) - return NULL; + if (!after) return NULL; it = create_tab_item(obj, icon_path, label, view); - if (it == NULL) - return NULL; + if (!it) return NULL; wd = elm_widget_data_get(obj); item = elm_controlbar_item_next(after); - if(check_bar_item_number(wd) >= 5 && wd->auto_align){ - if(!wd->more_item) - { - lit = elm_controlbar_last_item_get(obj); - item_visible_set(lit, EINA_FALSE); - create_more_item(wd, TABBAR); - } - lit = elm_controlbar_item_prev(wd->more_item); - if(lit != after && item->order > 0) - { - item_visible_set(lit, EINA_FALSE); - set_items_position(obj, it, item, EINA_TRUE); - } - else - { - set_items_position(obj, it, NULL, EINA_FALSE); - } - } - else{ - set_items_position(obj, it, item, EINA_TRUE); - } + if(check_bar_item_number(wd) >= 5 && wd->auto_align) + { + if(!wd->more_item) + { + lit = elm_controlbar_last_item_get(obj); + item_visible_set(lit, EINA_FALSE); + create_more_item(wd, TABBAR); + } + lit = elm_controlbar_item_prev(wd->more_item); + if(lit != after && item->order > 0) + { + item_visible_set(lit, EINA_FALSE); + set_items_position(obj, it, item, EINA_TRUE); + } + else + { + set_items_position(obj, it, NULL, EINA_FALSE); + } + } + else + { + set_items_position(obj, it, item, EINA_TRUE); + } wd->items = eina_list_append_relative(wd->items, it, after); if(wd->more_item) - elm_controlbar_item_view_set(wd->more_item, create_more_view(wd)); + elm_controlbar_item_view_set(wd->more_item, create_more_view(wd)); if (wd->num == 1) selected_box(it); _sizing_eval(obj); @@ -2689,40 +2671,34 @@ elm_controlbar_tab_item_insert_after(Evas_Object * obj, * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * elm_controlbar_tool_item_append(Evas_Object * - obj, - const char - *icon_path, - const char - *label, - void (*func) - (void *data, - Evas_Object * - obj, - void - *event_info), - void *data) - +EAPI Elm_Controlbar_Item * +elm_controlbar_tool_item_append(Evas_Object *obj, + const char *icon_path, + const char *label, + void (*func)(void *data, Evas_Object *obj, void *event_info), + void *data) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Elm_Controlbar_Item * it; Elm_Controlbar_Item * lit; Widget_Data * wd; it = create_tool_item(obj, icon_path, label, func, data); - if (it == NULL) - return NULL; + if (!it) return NULL; wd = elm_widget_data_get(obj); - if(check_bar_item_number(wd) >= 5 && wd->auto_align){ - if(!wd->more_item) { - lit = elm_controlbar_last_item_get(obj); - item_visible_set(lit, EINA_FALSE); - create_more_item(wd, TOOLBAR); - } - set_items_position(obj, it, NULL, EINA_FALSE); - } - else{ - set_items_position(obj, it, NULL, EINA_TRUE); - } + if(check_bar_item_number(wd) >= 5 && wd->auto_align) + { + if(!wd->more_item) + { + lit = elm_controlbar_last_item_get(obj); + item_visible_set(lit, EINA_FALSE); + create_more_item(wd, TOOLBAR); + } + set_items_position(obj, it, NULL, EINA_FALSE); + } + else + { + set_items_position(obj, it, NULL, EINA_TRUE); + } wd->items = eina_list_append(wd->items, it); _sizing_eval(obj); return it; @@ -2740,21 +2716,12 @@ elm_controlbar_tab_item_insert_after(Evas_Object * obj, * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * elm_controlbar_tool_item_prepend(Evas_Object * - obj, - const char - *icon_path, - const char - *label, - void (*func) - (void - *data, - Evas_Object * - obj, - void - *event_info), - void - *data) +EAPI Elm_Controlbar_Item * +elm_controlbar_tool_item_prepend(Evas_Object *obj, + const char *icon_path, + const char *label, + void (*func)(void *data, Evas_Object *obj, void *event_info), + void *data) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data * wd; @@ -2762,23 +2729,25 @@ elm_controlbar_tab_item_insert_after(Evas_Object * obj, Elm_Controlbar_Item * lit; Elm_Controlbar_Item * item; it = create_tool_item(obj, icon_path, label, func, data); - if (it == NULL) - return NULL; + if (!it) return NULL; wd = elm_widget_data_get(obj); item = eina_list_data_get(wd->items); - if(check_bar_item_number(wd) >= 5 && wd->auto_align){ - if(!wd->more_item) { - lit = elm_controlbar_last_item_get(obj); - item_visible_set(lit, EINA_FALSE); - create_more_item(wd, TOOLBAR); - } - lit = elm_controlbar_item_prev(wd->more_item); - item_visible_set(lit, EINA_FALSE); - set_items_position(obj, it, item, EINA_TRUE); - } - else{ - set_items_position(obj, it, item, EINA_TRUE); - } + if(check_bar_item_number(wd) >= 5 && wd->auto_align) + { + if(!wd->more_item) + { + lit = elm_controlbar_last_item_get(obj); + item_visible_set(lit, EINA_FALSE); + create_more_item(wd, TOOLBAR); + } + lit = elm_controlbar_item_prev(wd->more_item); + item_visible_set(lit, EINA_FALSE); + set_items_position(obj, it, item, EINA_TRUE); + } + else + { + set_items_position(obj, it, item, EINA_TRUE); + } wd->items = eina_list_prepend(wd->items, it); _sizing_eval(obj); return it; @@ -2797,7 +2766,7 @@ elm_controlbar_tab_item_insert_after(Evas_Object * obj, * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * +EAPI Elm_Controlbar_Item * elm_controlbar_tool_item_insert_before(Evas_Object * obj, Elm_Controlbar_Item * before, const char *icon_path, @@ -2811,34 +2780,34 @@ elm_controlbar_tool_item_insert_before(Evas_Object * obj, Widget_Data * wd; Elm_Controlbar_Item * it; Elm_Controlbar_Item * lit; - if (!before) - return NULL; + if (!before) return NULL; it = create_tool_item(obj, icon_path, label, func, data); - if (it == NULL) - return NULL; + if (!it) return NULL; wd = elm_widget_data_get(obj); - if(check_bar_item_number(wd) >= 5 && wd->auto_align){ - if(!wd->more_item) - { - lit = elm_controlbar_last_item_get(obj); - item_visible_set(lit, EINA_FALSE); - create_more_item(wd, TOOLBAR); - } - before = wd->more_item; - if(before->order > 0) - { - lit = elm_controlbar_item_prev(wd->more_item); - item_visible_set(lit, EINA_FALSE); - set_items_position(obj, it, before, EINA_TRUE); - } - else - { - set_items_position(obj, it, before, EINA_FALSE); - } - } - else{ - set_items_position(obj, it, before, EINA_TRUE); - } + if(check_bar_item_number(wd) >= 5 && wd->auto_align) + { + if(!wd->more_item) + { + lit = elm_controlbar_last_item_get(obj); + item_visible_set(lit, EINA_FALSE); + create_more_item(wd, TOOLBAR); + } + before = wd->more_item; + if(before->order > 0) + { + lit = elm_controlbar_item_prev(wd->more_item); + item_visible_set(lit, EINA_FALSE); + set_items_position(obj, it, before, EINA_TRUE); + } + else + { + set_items_position(obj, it, before, EINA_FALSE); + } + } + else + { + set_items_position(obj, it, before, EINA_TRUE); + } wd->items = eina_list_prepend_relative(wd->items, it, before); _sizing_eval(obj); return it; @@ -2857,7 +2826,7 @@ elm_controlbar_tool_item_insert_before(Evas_Object * obj, * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * +EAPI Elm_Controlbar_Item * elm_controlbar_tool_item_insert_after(Evas_Object * obj, Elm_Controlbar_Item * after, const char *icon_path, @@ -2872,34 +2841,34 @@ elm_controlbar_tool_item_insert_after(Evas_Object * obj, Elm_Controlbar_Item * it; Elm_Controlbar_Item * lit; Elm_Controlbar_Item * item; - if (!after) - return NULL; + if (!after) return NULL; it = create_tool_item(obj, icon_path, label, func, data); - if (it == NULL) - return NULL; + if (!it) return NULL; wd = elm_widget_data_get(obj); item = elm_controlbar_item_next(after); - if(check_bar_item_number(wd) >= 5 && wd->auto_align){ - if(!wd->more_item) - { - lit = elm_controlbar_last_item_get(obj); - item_visible_set(lit, EINA_FALSE); - create_more_item(wd, TOOLBAR); - } - lit = elm_controlbar_item_prev(wd->more_item); - if(lit != after && item->order > 0) - { - item_visible_set(lit, EINA_FALSE); - set_items_position(obj, it, item, EINA_TRUE); - } - else - { - set_items_position(obj, it, NULL, EINA_FALSE); - } - } - else{ - set_items_position(obj, it, item, EINA_TRUE); - } + if(check_bar_item_number(wd) >= 5 && wd->auto_align) + { + if(!wd->more_item) + { + lit = elm_controlbar_last_item_get(obj); + item_visible_set(lit, EINA_FALSE); + create_more_item(wd, TOOLBAR); + } + lit = elm_controlbar_item_prev(wd->more_item); + if(lit != after && item->order > 0) + { + item_visible_set(lit, EINA_FALSE); + set_items_position(obj, it, item, EINA_TRUE); + } + else + { + set_items_position(obj, it, NULL, EINA_FALSE); + } + } + else + { + set_items_position(obj, it, item, EINA_TRUE); + } wd->items = eina_list_append_relative(wd->items, it, after); _sizing_eval(obj); return it; @@ -2915,18 +2884,17 @@ elm_controlbar_tool_item_insert_after(Evas_Object * obj, * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * elm_controlbar_object_item_append(Evas_Object * - obj, - Evas_Object * - obj_item, - const int sel) +EAPI Elm_Controlbar_Item * +elm_controlbar_object_item_append(Evas_Object *obj, + Evas_Object * + obj_item, + const int sel) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data * wd; Elm_Controlbar_Item * it; it = create_object_item(obj, obj_item, sel); - if (it == NULL) - return NULL; + if (!it) return NULL; wd = elm_widget_data_get(obj); set_items_position(obj, it, NULL, EINA_TRUE); wd->items = eina_list_append(wd->items, it); @@ -2944,19 +2912,18 @@ elm_controlbar_tool_item_insert_after(Evas_Object * obj, * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * elm_controlbar_object_item_prepend(Evas_Object * - obj, - Evas_Object * - obj_item, - const int sel) +EAPI Elm_Controlbar_Item * +elm_controlbar_object_item_prepend(Evas_Object *obj, + Evas_Object * + obj_item, + const int sel) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data * wd; Elm_Controlbar_Item * it; Elm_Controlbar_Item * item; it = create_object_item(obj, obj_item, sel); - if (it == NULL) - return NULL; + if (!it) return NULL; wd = elm_widget_data_get(obj); item = eina_list_data_get(wd->items); set_items_position(obj, it, item, EINA_TRUE); @@ -2976,7 +2943,7 @@ elm_controlbar_tool_item_insert_after(Evas_Object * obj, * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * +EAPI Elm_Controlbar_Item * elm_controlbar_object_item_insert_before(Evas_Object * obj, Elm_Controlbar_Item * before, Evas_Object * obj_item, const int sel) @@ -2984,11 +2951,9 @@ elm_controlbar_object_item_insert_before(Evas_Object * obj, ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data * wd; Elm_Controlbar_Item * it; - if (!before) - return NULL; + if (!before) return NULL; it = create_object_item(obj, obj_item, sel); - if (it == NULL) - return NULL; + if (!it) return NULL; wd = elm_widget_data_get(obj); set_items_position(obj, it, before, EINA_TRUE); wd->items = eina_list_prepend_relative(wd->items, it, before); @@ -3007,7 +2972,7 @@ elm_controlbar_object_item_insert_before(Evas_Object * obj, * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * +EAPI Elm_Controlbar_Item * elm_controlbar_object_item_insert_after(Evas_Object * obj, Elm_Controlbar_Item * after, Evas_Object * obj_item, const int sel) @@ -3036,7 +3001,7 @@ elm_controlbar_object_item_insert_after(Evas_Object * obj, * @ingroup Controlbar */ - EAPI void +EAPI void elm_controlbar_item_del(Elm_Controlbar_Item * it) { Evas_Object * obj; @@ -3135,14 +3100,12 @@ elm_controlbar_item_del(Elm_Controlbar_Item * it) * @ingroup Controlbar */ - EAPI void +EAPI void elm_controlbar_item_select(Elm_Controlbar_Item * it) { - if (it == NULL) return; - if (it->obj == NULL) return; + if (!it || !it->obj) return; Widget_Data * wd = elm_widget_data_get(it->obj); - if (wd == NULL) - return; + if (!wd) return; if (!wd->edit_mode) { selected_box(it); @@ -3161,10 +3124,9 @@ elm_controlbar_item_select(Elm_Controlbar_Item * it) EAPI void elm_controlbar_item_icon_set(Elm_Controlbar_Item * it, const char *icon_path) { - if (it == NULL) - return; + if (!it) return; if(it->icon_path) - eina_stringshare_del(it->icon_path); + eina_stringshare_del(it->icon_path); it->icon_path = eina_stringshare_add(icon_path); if(it->icon) @@ -3233,29 +3195,29 @@ elm_controlbar_item_icon_get(Elm_Controlbar_Item * it) * * @ingroup Controlbar */ - EAPI void +EAPI void elm_controlbar_item_label_set(Elm_Controlbar_Item * it, const char *label) { - if (it == NULL) - return; + if (!it) return; it->text = eina_stringshare_add(label); it->label = create_item_label(it->base_item, it, "elm.swallow.text"); it->edit_label = create_item_label(it->edit_item, it, "elm.swallow.text"); - if(it->label && it->icon){ - edje_object_signal_emit(_EDJ(it->base_item), "elm,state,icon_text", "elm"); - elm_label_line_wrap_set(it->label, EINA_FALSE); - elm_label_wrap_mode_set(it->label, 0); - elm_label_line_wrap_set(it->label_shadow, EINA_FALSE); - elm_label_wrap_mode_set(it->label_shadow, 0); - } + if(it->label && it->icon) + { + edje_object_signal_emit(_EDJ(it->base_item), "elm,state,icon_text", "elm"); + elm_label_line_wrap_set(it->label, EINA_FALSE); + elm_label_wrap_mode_set(it->label, 0); + elm_label_line_wrap_set(it->label_shadow, EINA_FALSE); + elm_label_wrap_mode_set(it->label_shadow, 0); + } if(it->edit_label && it->edit_icon) { - edje_object_signal_emit(_EDJ(it->edit_item), "elm,state,icon_text", "elm"); - elm_label_line_wrap_set(it->edit_label, EINA_FALSE); - elm_label_wrap_mode_set(it->edit_label, 0); - elm_label_line_wrap_set(it->edit_label_shadow, EINA_FALSE); - elm_label_wrap_mode_set(it->edit_label_shadow, 0); + edje_object_signal_emit(_EDJ(it->edit_item), "elm,state,icon_text", "elm"); + elm_label_line_wrap_set(it->edit_label, EINA_FALSE); + elm_label_wrap_mode_set(it->edit_label, 0); + elm_label_line_wrap_set(it->edit_label_shadow, EINA_FALSE); + elm_label_wrap_mode_set(it->edit_label_shadow, 0); } } @@ -3281,23 +3243,21 @@ elm_controlbar_item_label_get(Elm_Controlbar_Item * it) * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * elm_controlbar_selected_item_get(Evas_Object * - obj) +EAPI Elm_Controlbar_Item * +elm_controlbar_selected_item_get(Evas_Object *obj) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; const Eina_List *l; Elm_Controlbar_Item * item; - if (obj == NULL) - return NULL; + if (!obj) return NULL; Widget_Data * wd = elm_widget_data_get(obj); - if (!wd || !wd->items) - return NULL; + if (!wd || !wd->items) return NULL; EINA_LIST_FOREACH(wd->items, l, item) - { - if (item->selected) - return item; - } + { + if (item->selected) + return item; + } return NULL; } @@ -3309,12 +3269,12 @@ elm_controlbar_item_label_get(Elm_Controlbar_Item * it) * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * elm_controlbar_first_item_get(Evas_Object * obj) +EAPI Elm_Controlbar_Item * +elm_controlbar_first_item_get(Evas_Object * obj) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data * wd = elm_widget_data_get(obj); - if (!wd || !wd->items) - return NULL; + if (!wd || !wd->items) return NULL; return eina_list_data_get(wd->items); } @@ -3326,12 +3286,12 @@ elm_controlbar_item_label_get(Elm_Controlbar_Item * it) * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * elm_controlbar_last_item_get(Evas_Object * obj) +EAPI Elm_Controlbar_Item * +elm_controlbar_last_item_get(Evas_Object * obj) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data * wd = elm_widget_data_get(obj); - if (!wd || !wd->items) - return NULL; + if (!wd || !wd->items) return NULL; return eina_list_data_get(eina_list_last(wd->items)); } @@ -3343,12 +3303,12 @@ elm_controlbar_item_label_get(Elm_Controlbar_Item * it) * * @ingroup Controlbar */ - EAPI Eina_List * elm_controlbar_items_get(Evas_Object * obj) +EAPI Eina_List * +elm_controlbar_items_get(Evas_Object * obj) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data * wd = elm_widget_data_get(obj); - if (!wd || !wd->items) - return NULL; + if (!wd || !wd->items) return NULL; return wd->items; } @@ -3360,27 +3320,24 @@ elm_controlbar_item_label_get(Elm_Controlbar_Item * it) * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * elm_controlbar_item_prev(Elm_Controlbar_Item * - it) +EAPI Elm_Controlbar_Item * +elm_controlbar_item_prev(Elm_Controlbar_Item *it) { const Eina_List *l; Elm_Controlbar_Item * item; - if (it->obj == NULL) - return NULL; + if (!it->obj == NULL) return NULL; Widget_Data * wd = elm_widget_data_get(it->obj); - if (!wd || !wd->items) - return NULL; + if (!wd || !wd->items) return NULL; EINA_LIST_FOREACH(wd->items, l, item) - { - if (it == item) - { - l = eina_list_prev(l); - if (!l) - return NULL; - return eina_list_data_get(l); - } - } + { + if (it == item) + { + l = eina_list_prev(l); + if (!l) return NULL; + return eina_list_data_get(l); + } + } return NULL; } @@ -3392,7 +3349,7 @@ elm_controlbar_item_label_get(Elm_Controlbar_Item * it) * * @ingroup Controlbar */ - EAPI Elm_Controlbar_Item * elm_controlbar_item_next(Elm_Controlbar_Item * +EAPI Elm_Controlbar_Item * elm_controlbar_item_next(Elm_Controlbar_Item * it) { const Eina_List *l; @@ -3416,7 +3373,7 @@ elm_controlbar_item_label_get(Elm_Controlbar_Item * it) return NULL; } - EAPI void +EAPI void elm_controlbar_edit_start(Evas_Object * obj) { printf("\n==================================\n"); @@ -3449,15 +3406,12 @@ elm_controlbar_edit_start(Evas_Object * obj) EAPI void elm_controlbar_item_visible_set(Elm_Controlbar_Item * it, Eina_Bool visible) { - if(!it) return; - if (it->obj == NULL) - return; + if(!it || !it->obj) return; Widget_Data * wd = elm_widget_data_get(it->obj); - if (!wd) - return; + if (!wd) return; if(!wd->auto_align) - item_visible_set(it, visible); + item_visible_set(it, visible); } /** @@ -3471,41 +3425,38 @@ elm_controlbar_item_visible_set(Elm_Controlbar_Item * it, Eina_Bool visible) EAPI Eina_Bool elm_controlbar_item_visible_get(Elm_Controlbar_Item * it) { - if(!it) return EINA_FALSE; - - if (it->obj == NULL) - return EINA_FALSE; + if (!it || !it->obj) return EINA_FALSE; Widget_Data * wd = elm_widget_data_get(it->obj); - if (!wd) - return EINA_FALSE; + if (!wd) return EINA_FALSE; - if(it->order <= 0) + if (it->order <= 0) return EINA_FALSE; return EINA_TRUE; } - EAPI void +EAPI void elm_controlbar_item_editable_set(Elm_Controlbar_Item * it, Eina_Bool editable) { Evas_Object * color; int r, g, b, a; - if(!it) return; - - if(it->editable == editable) return; + if(!it || it->editable == editable) return; it->editable = editable; - if(it->editable){ - - }else{ - color = - (Evas_Object *) edje_object_part_object_get(_EDJ(it->edit_item), - "elm.item.uneditable.color"); - if (color) - evas_object_color_get(color, &r, &g, &b, &a); - evas_object_color_set(it->edit_item, r, g, b, a); - } + if(it->editable) + { + + } + else + { + color = + (Evas_Object *) edje_object_part_object_get(_EDJ(it->edit_item), + "elm.item.uneditable.color"); + if (color) + evas_object_color_get(color, &r, &g, &b, &a); + evas_object_color_set(it->edit_item, r, g, b, a); + } } /** @@ -3516,7 +3467,7 @@ elm_controlbar_item_editable_set(Elm_Controlbar_Item * it, Eina_Bool editable) * * @ingroup Controlbar */ - EAPI void +EAPI void elm_controlbar_item_disable_set(Elm_Controlbar_Item * it, Eina_Bool disable) { if(!it) return; @@ -3526,16 +3477,12 @@ elm_controlbar_item_disable_set(Elm_Controlbar_Item * it, Eina_Bool disable) it->disable = disable; if(it->disable) - { - item_color_set(it, "elm.item.disable.color"); - } + item_color_set(it, "elm.item.disable.color"); else - { - item_color_set(it, "elm.item.default.color"); - } + item_color_set(it, "elm.item.default.color"); } - EAPI void +EAPI void elm_controlbar_view_set(Evas_Object * obj, Evas_Object * view) { printf("\n==================================\n"); @@ -3546,7 +3493,7 @@ elm_controlbar_view_set(Evas_Object * obj, Evas_Object * view) printf("Thank you.\n"); printf("==================================\n"); - ELM_CHECK_WIDTYPE(obj, widtype) NULL; + ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (wd == NULL) { @@ -3598,7 +3545,7 @@ elm_controlbar_item_view_get(Elm_Controlbar_Item *it) * * @ingroup Controlbar */ - EAPI void +EAPI void elm_controlbar_mode_set(Evas_Object *obj, int mode) { ELM_CHECK_WIDTYPE(obj, widtype); @@ -3662,7 +3609,7 @@ elm_controlbar_mode_set(Evas_Object *obj, int mode) * * @ingroup Controlbar */ - EAPI void +EAPI void elm_controlbar_alpha_set(Evas_Object *obj, int alpha) { ELM_CHECK_WIDTYPE(obj, widtype); @@ -3670,16 +3617,16 @@ elm_controlbar_alpha_set(Evas_Object *obj, int alpha) Widget_Data *wd = elm_widget_data_get(obj); if (wd == NULL) { - fprintf(stderr, "Cannot get smart data\n"); - return; + fprintf(stderr, "Cannot get smart data\n"); + return; } if(alpha < 0) - wd->alpha = 0; + wd->alpha = 0; else if(alpha > 100) - wd->alpha = 100; + wd->alpha = 100; else - wd->alpha = alpha; + wd->alpha = alpha; evas_object_color_get(wd->bg, &r, &g, &b, NULL); evas_object_color_set(wd->bg, r, g, b, (int)(255 * wd->alpha / 100)); @@ -3834,8 +3781,8 @@ elm_controlbar_animation_set(Evas_Object *obj, void (*func) (void *data, Evas_Ob Widget_Data *wd = elm_widget_data_get(obj); if (wd == NULL) { - fprintf(stderr, "Cannot get smart data\n"); - return; + fprintf(stderr, "Cannot get smart data\n"); + return; } // if(!func) @@ -3864,20 +3811,20 @@ elm_controlbar_item_animation_set(Evas_Object *obj, Eina_Bool auto_animation, Ei Widget_Data *wd = elm_widget_data_get(obj); if (wd == NULL) { - fprintf(stderr, "Cannot get smart data\n"); - return; + fprintf(stderr, "Cannot get smart data\n"); + return; } if(auto_animation && !wd->effect_timer) { - wd->effect_timer = ecore_timer_add(1.5, item_animation_effect, wd); + wd->effect_timer = ecore_timer_add(1.5, item_animation_effect, wd); } else { - if(wd->effect_timer) ecore_timer_del(wd->effect_timer); - wd->effect_timer = NULL; + if(wd->effect_timer) ecore_timer_del(wd->effect_timer); + wd->effect_timer = NULL; } - + wd->selected_animation = selected_animation; } -- 2.7.4