From 461cc587cb65d76c0c24e97229268f9f29be8101 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EA=B9=80=EC=A7=80=ED=9B=88?= Date: Sun, 19 Sep 2010 02:30:14 +0000 Subject: [PATCH] =?utf8?q?From:=20=EA=B9=80=EC=A7=80=ED=9B=88=20=20Subject:=20patch=20for=20indentation=20and=20using?= =?utf8?q?=20enum=20in=20elementary?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit I send the patch for elementary. In this patch, I fixed the indentation of Elementary.h.in. In addition, I use EINA_TRUE or EINA_FALSE instead of 1 or 0. EVAS_HINT_EXPAND and EVA_HINT_FILL is used instead of 1.0 and -1.0. Thanks. SVN revision: 52447 --- src/lib/Elementary.h.in | 114 +++++++++++++++++++------------------- src/lib/elc_anchorblock.c | 4 +- src/lib/elc_anchorview.c | 4 +- src/lib/elc_fileselector_button.c | 4 +- src/lib/elc_hoversel.c | 4 +- src/lib/elm_button.c | 6 +- src/lib/elm_entry.c | 14 ++--- src/lib/elm_index.c | 4 +- src/lib/elm_list.c | 12 ++-- src/lib/elm_theme.c | 2 +- src/lib/elm_widget.h | 6 +- 11 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index 0c6a1ef..fef93d3 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -1,6 +1,6 @@ /* * - * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + * vim:ts=8:sw=3:sts=3:expandtab:cino=>5n-2f0^-2{2(0W1st0 */ #ifndef ELEMENTARY_H #define ELEMENTARY_H @@ -728,14 +728,14 @@ extern "C" { EAPI void elm_notify_content_set(Evas_Object *obj, Evas_Object *content); EAPI Evas_Object *elm_notify_content_unset(Evas_Object *obj); EAPI Evas_Object *elm_notify_content_get(const Evas_Object *obj); - EAPI void elm_notify_parent_set(Evas_Object *obj, Evas_Object *parent); - EAPI void elm_notify_orient_set(Evas_Object *obj, Elm_Notify_Orient orient); + EAPI void elm_notify_parent_set(Evas_Object *obj, Evas_Object *parent); + EAPI void elm_notify_orient_set(Evas_Object *obj, Elm_Notify_Orient orient); EAPI Elm_Notify_Orient elm_notify_orient_get(const Evas_Object *obj); EAPI void elm_notify_timeout_set(Evas_Object *obj, int timeout); EAPI int elm_notify_timeout_get(const Evas_Object *obj); - EAPI void elm_notify_timer_init(Evas_Object *obj); - EAPI void elm_notify_repeat_events_set(Evas_Object *obj, Eina_Bool repeat); - EAPI Eina_Bool elm_notify_repeat_events_get(const Evas_Object *obj); + EAPI void elm_notify_timer_init(Evas_Object *obj); + EAPI void elm_notify_repeat_events_set(Evas_Object *obj, Eina_Bool repeat); + EAPI Eina_Bool elm_notify_repeat_events_get(const Evas_Object *obj); /* smart callbacks called: */ @@ -928,7 +928,7 @@ extern "C" { EAPI Evas_Object *elm_photo_add(Evas_Object *parent); EAPI Eina_Bool elm_photo_file_set(Evas_Object *obj, const char *file); EAPI void elm_photo_size_set(Evas_Object *obj, int size); - EAPI void elm_photo_fill_inside_set(Evas_Object *obj, Eina_Bool fill); + EAPI void elm_photo_fill_inside_set(Evas_Object *obj, Eina_Bool fill); /* smart callbacks called: * "clicked" - the user clicked the icon */ @@ -1041,8 +1041,8 @@ extern "C" { EAPI void elm_object_tooltip_style_set(Evas_Object *obj, const char *style); EAPI const char *elm_object_tooltip_style_get(const Evas_Object *obj); - EAPI void elm_object_cursor_set(Evas_Object *obj, const char *cursor); - EAPI void elm_object_cursor_unset(Evas_Object *obj); + EAPI void elm_object_cursor_set(Evas_Object *obj, const char *cursor); + EAPI void elm_object_cursor_unset(Evas_Object *obj); typedef struct _Elm_Menu_Item Elm_Menu_Item; /**< Item of Elm_Menu. Sub-type of Elm_Widget_Item */ EAPI Evas_Object *elm_menu_add(Evas_Object *parent); @@ -1312,27 +1312,27 @@ extern "C" { } func; }; - EAPI Evas_Object *elm_slideshow_add(Evas_Object *parent); - EAPI Elm_Slideshow_Item *elm_slideshow_item_add(Evas_Object *obj, const Elm_Slideshow_Item_Class *itc, const void *data); - EAPI void elm_slideshow_show(Elm_Slideshow_Item *item); - EAPI void elm_slideshow_next(Evas_Object *obj); - EAPI void elm_slideshow_previous(Evas_Object *obj); - EAPI const Eina_List *elm_slideshow_transitions_get(const Evas_Object *obj); - EAPI void elm_slideshow_transition_set(Evas_Object *obj, const char *); - EAPI const char *elm_slideshow_transition_get(const Evas_Object *obj); - EAPI void elm_slideshow_timeout_set(Evas_Object *obj ,int timeout); - EAPI int elm_slideshow_timeout_get(const Evas_Object *obj); - EAPI void elm_slideshow_loop_set(Evas_Object *obj, Eina_Bool loop); - EAPI Eina_Bool elm_slideshow_loop_get(const Evas_Object *obj); - EAPI void elm_slideshow_clear(Evas_Object *obj); - EAPI const Eina_List *elm_slideshow_items_get(const Evas_Object *obj); - EAPI void elm_slideshow_item_del(Elm_Slideshow_Item *item); - EAPI void *elm_slideshow_item_data_get(Elm_Slideshow_Item *item); - EAPI Elm_Slideshow_Item *elm_slideshow_item_current_get(const Evas_Object *obj); - EAPI Evas_Object* elm_slideshow_item_object_get(Elm_Slideshow_Item* item); - EAPI const char *elm_slideshow_layout_get(const Evas_Object *obj); - EAPI void elm_slideshow_layout_set(Evas_Object *obj, const char *layout); - EAPI const Eina_List *elm_slideshow_layouts_get(const Evas_Object *obj); + EAPI Evas_Object *elm_slideshow_add(Evas_Object *parent); + EAPI Elm_Slideshow_Item *elm_slideshow_item_add(Evas_Object *obj, const Elm_Slideshow_Item_Class *itc, const void *data); + EAPI void elm_slideshow_show(Elm_Slideshow_Item *item); + EAPI void elm_slideshow_next(Evas_Object *obj); + EAPI void elm_slideshow_previous(Evas_Object *obj); + EAPI const Eina_List *elm_slideshow_transitions_get(const Evas_Object *obj); + EAPI void elm_slideshow_transition_set(Evas_Object *obj, const char *); + EAPI const char *elm_slideshow_transition_get(const Evas_Object *obj); + EAPI void elm_slideshow_timeout_set(Evas_Object *obj ,int timeout); + EAPI int elm_slideshow_timeout_get(const Evas_Object *obj); + EAPI void elm_slideshow_loop_set(Evas_Object *obj, Eina_Bool loop); + EAPI Eina_Bool elm_slideshow_loop_get(const Evas_Object *obj); + EAPI void elm_slideshow_clear(Evas_Object *obj); + EAPI const Eina_List *elm_slideshow_items_get(const Evas_Object *obj); + EAPI void elm_slideshow_item_del(Elm_Slideshow_Item *item); + EAPI void *elm_slideshow_item_data_get(Elm_Slideshow_Item *item); + EAPI Elm_Slideshow_Item *elm_slideshow_item_current_get(const Evas_Object *obj); + EAPI Evas_Object* elm_slideshow_item_object_get(Elm_Slideshow_Item* item); + EAPI const char *elm_slideshow_layout_get(const Evas_Object *obj); + EAPI void elm_slideshow_layout_set(Evas_Object *obj, const char *layout); + EAPI const Eina_List *elm_slideshow_layouts_get(const Evas_Object *obj); EAPI Evas_Object *elm_fileselector_add(Evas_Object *parent); @@ -1426,10 +1426,10 @@ extern "C" { EAPI Elm_Index_Item *elm_index_item_find(Evas_Object *obj, const void *item); EAPI void elm_index_item_clear(Evas_Object *obj); EAPI void elm_index_item_go(Evas_Object *obj, int level); - EAPI void *elm_index_item_data_get(const Elm_Index_Item *item); + EAPI void *elm_index_item_data_get(const Elm_Index_Item *item); EAPI void elm_index_item_data_set(Elm_Index_Item *it, const void *data); EAPI void elm_index_item_del_cb_set(Elm_Index_Item *it, Evas_Smart_Cb func); - EAPI const char *elm_index_item_letter_get(const Elm_Index_Item *item); + EAPI const char *elm_index_item_letter_get(const Elm_Index_Item *item); /* smart callbacks called: * "changed" - when the selected index item changes * "delay,changed" - when the selected index item changes, but after some small idle period @@ -1688,18 +1688,18 @@ extern "C" { typedef enum {ELM_ANIMATOR_CURVE_LINEAR, ELM_ANIMATOR_CURVE_IN_OUT, ELM_ANIMATOR_CURVE_IN, ELM_ANIMATOR_CURVE_OUT} Elm_Animator_Curve_Style; EAPI Elm_Animator* elm_animator_add(Evas_Object *parent); - EAPI void elm_animator_del(Elm_Animator *animator); - EAPI void elm_animator_duration_set(Elm_Animator *animator, double duration); - EAPI void elm_animator_operation_callback_set(Elm_Animator *animator, void (*func)(void *data, Elm_Animator *animator, double frame), void *data); - EAPI void elm_animator_completion_callback_set(Elm_Animator *animator, void (*func)(void *data), void *data); - EAPI void elm_animator_stop(Elm_Animator *animator); - EAPI void elm_animator_repeat_set(Elm_Animator *animator, unsigned int repeat_cnt); - EAPI void elm_animator_animate(Elm_Animator *animator); - EAPI void elm_animator_curve_style_set(Elm_Animator *animator, Elm_Animator_Curve_Style cs); - EAPI void elm_animator_auto_reverse_set(Elm_Animator *animator, Eina_Bool reverse); - EAPI Eina_Bool elm_animator_auto_reverse_get(Elm_Animator *animator); - EAPI Eina_Bool elm_animator_operating_get(Elm_Animator *animator); - EAPI unsigned int elm_animator_repeat_get(Elm_Animator *animator); + EAPI void elm_animator_del(Elm_Animator *animator); + EAPI void elm_animator_duration_set(Elm_Animator *animator, double duration); + EAPI void elm_animator_operation_callback_set(Elm_Animator *animator, void (*func)(void *data, Elm_Animator *animator, double frame), void *data); + EAPI void elm_animator_completion_callback_set(Elm_Animator *animator, void (*func)(void *data), void *data); + EAPI void elm_animator_stop(Elm_Animator *animator); + EAPI void elm_animator_repeat_set(Elm_Animator *animator, unsigned int repeat_cnt); + EAPI void elm_animator_animate(Elm_Animator *animator); + EAPI void elm_animator_curve_style_set(Elm_Animator *animator, Elm_Animator_Curve_Style cs); + EAPI void elm_animator_auto_reverse_set(Elm_Animator *animator, Eina_Bool reverse); + EAPI Eina_Bool elm_animator_auto_reverse_get(Elm_Animator *animator); + EAPI Eina_Bool elm_animator_operating_get(Elm_Animator *animator); + EAPI unsigned int elm_animator_repeat_get(Elm_Animator *animator); /* calendar */ typedef enum {ELM_CALENDAR_UNIQUE, ELM_CALENDAR_DAILY, ELM_CALENDAR_WEEKLY, ELM_CALENDAR_MONTHLY, ELM_CALENDAR_ANNUALLY} Elm_Calendar_Mark_Repeat; @@ -1707,21 +1707,21 @@ extern "C" { EAPI Evas_Object *elm_calendar_add(Evas_Object *parent); EAPI const char **elm_calendar_weekdays_names_get(const Evas_Object *obj); - EAPI void elm_calendar_weekdays_names_set(Evas_Object *obj, const char *weekdays[]); - EAPI double elm_calendar_interval_get(const Evas_Object *obj); - EAPI void elm_calendar_interval_set(Evas_Object *obj, double interval); - EAPI void elm_calendar_min_max_year_get(const Evas_Object *obj, int *min, int *max); - EAPI void elm_calendar_min_max_year_set(Evas_Object *obj, int min, int max); - EAPI Eina_Bool elm_calendar_day_selection_enabled_get(const Evas_Object *obj); - EAPI void elm_calendar_day_selection_enabled_set(Evas_Object *obj, Eina_Bool enabled); - EAPI Eina_Bool elm_calendar_selected_time_get(const Evas_Object *obj, struct tm *selected_time); - EAPI void elm_calendar_selected_time_set(Evas_Object *obj, struct tm *selected_time); - EAPI void elm_calendar_format_function_set(Evas_Object *obj, char * (*format_function) (struct tm *stime)); + EAPI void elm_calendar_weekdays_names_set(Evas_Object *obj, const char *weekdays[]); + EAPI double elm_calendar_interval_get(const Evas_Object *obj); + EAPI void elm_calendar_interval_set(Evas_Object *obj, double interval); + EAPI void elm_calendar_min_max_year_get(const Evas_Object *obj, int *min, int *max); + EAPI void elm_calendar_min_max_year_set(Evas_Object *obj, int min, int max); + EAPI Eina_Bool elm_calendar_day_selection_enabled_get(const Evas_Object *obj); + EAPI void elm_calendar_day_selection_enabled_set(Evas_Object *obj, Eina_Bool enabled); + EAPI Eina_Bool elm_calendar_selected_time_get(const Evas_Object *obj, struct tm *selected_time); + EAPI void elm_calendar_selected_time_set(Evas_Object *obj, struct tm *selected_time); + EAPI void elm_calendar_format_function_set(Evas_Object *obj, char * (*format_function) (struct tm *stime)); EAPI Elm_Calendar_Mark *elm_calendar_mark_add(Evas_Object *obj, const char *mark_type, struct tm *mark_time, Elm_Calendar_Mark_Repeat repeat); - EAPI void elm_calendar_mark_del(Elm_Calendar_Mark *mark); - EAPI void elm_calendar_marks_clear(Evas_Object *obj); + EAPI void elm_calendar_mark_del(Elm_Calendar_Mark *mark); + EAPI void elm_calendar_marks_clear(Evas_Object *obj); EAPI const Eina_List *elm_calendar_marks_get(const Evas_Object *obj); - EAPI void elm_calendar_marks_draw(Evas_Object *obj); + EAPI void elm_calendar_marks_draw(Evas_Object *obj); /* smart callbacks called: * changed - emitted when the user select a day or change the displayed * month. diff --git a/src/lib/elc_anchorblock.c b/src/lib/elc_anchorblock.c index 4497cc8..7370579 100644 --- a/src/lib/elc_anchorblock.c +++ b/src/lib/elc_anchorblock.c @@ -197,8 +197,8 @@ elm_anchorblock_add(Evas_Object *parent) elm_entry_item_provider_prepend(wd->entry, _item_provider, obj); elm_widget_resize_object_set(obj, wd->entry); elm_entry_editable_set(wd->entry, 0); - evas_object_size_hint_weight_set(wd->entry, 1.0, 1.0); - evas_object_size_hint_align_set(wd->entry, -1.0, -1.0); + evas_object_size_hint_weight_set(wd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(wd->entry, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_event_callback_add(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); diff --git a/src/lib/elc_anchorview.c b/src/lib/elc_anchorview.c index 097c06f..0356d92 100644 --- a/src/lib/elc_anchorview.c +++ b/src/lib/elc_anchorview.c @@ -189,8 +189,8 @@ elm_anchorview_add(Evas_Object *parent) wd->entry = elm_entry_add(parent); elm_entry_item_provider_prepend(wd->entry, _item_provider, obj); elm_entry_editable_set(wd->entry, 0); - evas_object_size_hint_weight_set(wd->entry, 1.0, 1.0); - evas_object_size_hint_align_set(wd->entry, -1.0, -1.0); + evas_object_size_hint_weight_set(wd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(wd->entry, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_scroller_content_set(wd->scroller, wd->entry); evas_object_show(wd->entry); diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c index 500f981..e96fb2d 100644 --- a/src/lib/elc_fileselector_button.c +++ b/src/lib/elc_fileselector_button.c @@ -81,12 +81,12 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj) if (elm_widget_focus_get(obj)) { edje_object_signal_emit(wd->btn, "elm,action,focus", "elm"); - evas_object_focus_set(wd->btn, 1); + evas_object_focus_set(wd->btn, EINA_TRUE); } else { edje_object_signal_emit(wd->btn, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->btn, 0); + evas_object_focus_set(wd->btn, EINA_FALSE); } } diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c index e45fc1d..b9dddcc 100644 --- a/src/lib/elc_hoversel.c +++ b/src/lib/elc_hoversel.c @@ -181,8 +181,8 @@ _activate(Evas_Object *obj) elm_button_icon_set(bt, ic); evas_object_show(ic); } - evas_object_size_hint_weight_set(bt, 1.0, 0.0); - evas_object_size_hint_align_set(bt, -1.0, -1.0); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, bt); evas_object_smart_callback_add(bt, "clicked", _item_clicked, it); evas_object_show(bt); diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index f7f134b..3299008 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c @@ -60,12 +60,12 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj) if (elm_widget_focus_get(obj)) { edje_object_signal_emit(wd->btn, "elm,action,focus", "elm"); - evas_object_focus_set(wd->btn, 1); + evas_object_focus_set(wd->btn, EINA_TRUE); } else { edje_object_signal_emit(wd->btn, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->btn, 0); + evas_object_focus_set(wd->btn, EINA_FALSE); } } @@ -242,7 +242,7 @@ elm_button_add(Evas_Object *parent) elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); elm_widget_disable_hook_set(obj, _disable_hook); - elm_widget_can_focus_set(obj, 1 ); + elm_widget_can_focus_set(obj, 1); wd->btn = edje_object_add(e); _elm_theme_object_set(obj, wd->btn, "button", "base", "default"); diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index 266ed34..d0ad12a 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -348,7 +348,7 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj) if (!wd->editable) return; if (elm_widget_focus_get(obj)) { - evas_object_focus_set(wd->ent, 1); + evas_object_focus_set(wd->ent, EINA_TRUE); edje_object_signal_emit(wd->ent, "elm,action,focus", "elm"); if (top) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); evas_object_smart_callback_call(obj, SIG_FOCUSED, NULL); @@ -356,7 +356,7 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj) else { edje_object_signal_emit(wd->ent, "elm,action,unfocus", "elm"); - evas_object_focus_set(wd->ent, 0); + evas_object_focus_set(wd->ent, EINA_FALSE); if (top) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); evas_object_smart_callback_call(obj, SIG_UNFOCUSED, NULL); } @@ -455,7 +455,7 @@ _dismissed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) if (wd->selmode) { if (!wd->password) - edje_object_part_text_select_allow_set(wd->ent, "elm.text", 1); + edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_TRUE); } elm_widget_scroll_freeze_pop(data); if (wd->hovdeljob) ecore_job_del(wd->hovdeljob); @@ -470,7 +470,7 @@ _select(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) wd->selmode = EINA_TRUE; edje_object_part_text_select_none(wd->ent, "elm.text"); if (!wd->password) - edje_object_part_text_select_allow_set(wd->ent, "elm.text", 1); + edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_TRUE); edje_object_signal_emit(wd->ent, "elm,state,select,on", "elm"); elm_widget_scroll_hold_push(data); } @@ -574,7 +574,7 @@ _long_press(void *data) (wd->ent, "context_menu_orientation"); if ((context_menu_orientation) && (!strcmp(context_menu_orientation, "horizontal"))) - elm_hoversel_horizontal_set(wd->hoversel, 1); + elm_hoversel_horizontal_set(wd->hoversel, EINA_TRUE); elm_object_style_set(wd->hoversel, "entry"); elm_widget_sub_object_add(data, wd->hoversel); elm_hoversel_label_set(wd->hoversel, "Text"); @@ -1262,8 +1262,8 @@ _event_selection_clear(void *data __UNUSED__, int type __UNUSED__, void *event _ /* Widget_Data *wd = elm_widget_data_get(data); Ecore_X_Event_Selection_Clear *ev = event; - if (!wd) return 1; - if (!wd->have_selection) return 1; + if (!wd) return ECORE_CALLBACK_PASS_ON; + if (!wd->have_selection) return ECORE_CALLBACK_PASS_ON; if ((ev->selection == ECORE_X_SELECTION_CLIPBOARD) || (ev->selection == ECORE_X_SELECTION_PRIMARY)) { diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c index ce2cbe2..49e0356 100644 --- a/src/lib/elm_index.c +++ b/src/lib/elm_index.c @@ -225,8 +225,8 @@ _index_box_auto_fill(Evas_Object *obj, Evas_Object *box, int level) edje_object_part_text_set(o, "elm.text", it->letter); edje_object_size_min_restricted_calc(o, &mw, &mh, 0, 0); evas_object_size_hint_min_set(o, mw, mh); - evas_object_size_hint_weight_set(o, 1.0, 1.0); - evas_object_size_hint_align_set(o, -1.0, -1.0); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_widget_sub_object_add(obj, o); evas_object_box_append(box, o); stacking = edje_object_data_get(o, "stacking"); diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c index 4b71403..1467225 100644 --- a/src/lib/elm_list.c +++ b/src/lib/elm_list.c @@ -240,9 +240,9 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj) Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; if (elm_widget_focus_get(obj)) - evas_object_focus_set(wd->scr, 1); + evas_object_focus_set(wd->scr, EINA_TRUE); else - evas_object_focus_set(wd->scr, 0); + evas_object_focus_set(wd->scr, EINA_FALSE); } static void @@ -509,8 +509,8 @@ _item_new(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *e _mouse_up, it); evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move, it); - evas_object_size_hint_weight_set(it->base.view, 1.0, 1.0); - evas_object_size_hint_align_set(it->base.view, -1.0, -1.0); + evas_object_size_hint_weight_set(it->base.view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(it->base.view, EVAS_HINT_FILL, EVAS_HINT_FILL); if (it->icon) { elm_widget_sub_object_add(obj, it->icon); @@ -754,8 +754,8 @@ elm_list_add(Evas_Object *parent) wd->box = elm_box_add(parent); elm_box_homogenous_set(wd->box, 1); - evas_object_size_hint_weight_set(wd->box, 1.0, 0.0); - evas_object_size_hint_align_set(wd->box, -1.0, 0.0); + evas_object_size_hint_weight_set(wd->box, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(wd->box, EVAS_HINT_FILL, 0.0); elm_scroller_content_set(wd->scr, wd->box); evas_object_show(wd->box); diff --git a/src/lib/elm_theme.c b/src/lib/elm_theme.c index 6f3109d..e349eae 100644 --- a/src/lib/elm_theme.c +++ b/src/lib/elm_theme.c @@ -480,7 +480,7 @@ elm_theme_flush(Elm_Theme *th) } /** - * This flushes all themems (default and specific ones). + * This flushes all themes (default and specific ones). * * This will flush all themes in the current application context, by calling * elm_theme_flush() on each of them. diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h index 238504b..11c3937 100644 --- a/src/lib/elm_widget.h +++ b/src/lib/elm_widget.h @@ -52,12 +52,12 @@ * if (elm_widget_focus_get(obj)) * { * edje_object_signal_emit(wd->sub, "elm,action,focus", "elm"); - * evas_object_focus_set(wd->sub, 1); + * evas_object_focus_set(wd->sub, EINA_TRUE); * } * else * { * edje_object_signal_emit(wd->sub, "elm,action,unfocus", "elm"); - * evas_object_focus_set(wd->sub, 0); + * evas_object_focus_set(wd->sub, EINA_FALSE); * } * } * @@ -127,7 +127,7 @@ * elm_widget_theme_hook_set(obj, _theme_hook); * elm_widget_disable_hook_set(obj, _disable_hook); * // this widget can focus (true, means yes it can, false means it can't) - * elm_widget_can_focus_set(obj, EINA_TRUE); + * elm_widget_can_focus_set(obj, 1); * * // for this widget we will ad d1 sub object that is an edje object * wd->sub = edje_object_add(e); -- 2.7.4