diff options
| author | Daniel Juyung Seo <juyung.seo@samsung.com> | 2013-12-02 21:17:06 +0900 |
|---|---|---|
| committer | Daniel Juyung Seo <juyung.seo@samsung.com> | 2013-12-02 21:20:03 +0900 |
| commit | 2ae7e32abca631e653cb352e7fa0ea9f1242006c (patch) | |
| tree | 315963e18f559198356bb19809287db0d8f3d6af | |
| parent | b44763b8ab709ce59eba290f317d0b8a2f465b1d (diff) | |
| download | elementary-2ae7e32abca631e653cb352e7fa0ea9f1242006c.tar.gz | |
popup: fixed formatting, typos, and subtle things of commit f4f2e5d24271cc6504443479381fdb26a605ac70
| -rw-r--r-- | src/bin/test_popup.c | 14 | ||||
| -rw-r--r-- | src/lib/elc_popup_eo.h | 4 | ||||
| -rw-r--r-- | src/lib/elc_popup_legacy.h | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/bin/test_popup.c b/src/bin/test_popup.c index c25486a9c..0b01b67f8 100644 --- a/src/bin/test_popup.c +++ b/src/bin/test_popup.c @@ -9,7 +9,7 @@ typedef struct { double x; double y; -}Evas_Rel_Coord_Point; +} Evas_Rel_Coord_Point; static Evas_Object *g_popup = NULL; static int times = 0; @@ -38,7 +38,7 @@ _popup_close_cb(void *data, Evas_Object *obj EINA_UNUSED, } static void -_popup_move_cb(void *data, Evas_Object *obj EINA_UNUSED, +_popup_align_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { static int k = 0; @@ -531,8 +531,8 @@ _popup_transparent_cb(void *data, Evas_Object *obj EINA_UNUSED, } static void -_popup_transparent_move_cb(void *data, Evas_Object *obj EINA_UNUSED, - void *event_info EINA_UNUSED) +_popup_transparent_align_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Evas_Object *popup; Evas_Object *btn, *btn1; @@ -545,7 +545,7 @@ _popup_transparent_move_cb(void *data, Evas_Object *obj EINA_UNUSED, btn = elm_button_add(popup); elm_object_text_set(btn, "Move"); elm_object_part_content_set(popup, "button1", btn); - evas_object_smart_callback_add(btn, "clicked", _popup_move_cb, popup); + evas_object_smart_callback_add(btn, "clicked", _popup_align_cb, popup); btn1 = elm_button_add(popup); elm_object_text_set(btn1, "Close"); @@ -638,8 +638,8 @@ test_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, _popup_center_text_3button_add_remove_button_cb, win); elm_list_item_append(list, "popup-transparent", NULL, NULL, _popup_transparent_cb, win); - elm_list_item_append(list, "popup-transparent-move", NULL, NULL, - _popup_transparent_move_cb, win); + elm_list_item_append(list, "popup-transparent-align", NULL, NULL, + _popup_transparent_align_cb, win); elm_list_item_append(list, "popup-center-title + list content + 1 button", NULL, NULL, _popup_center_title_list_content_1button_cb, win); diff --git a/src/lib/elc_popup_eo.h b/src/lib/elc_popup_eo.h index 835a3a18a..f1c8b1fd8 100644 --- a/src/lib/elc_popup_eo.h +++ b/src/lib/elc_popup_eo.h @@ -143,7 +143,7 @@ enum /** * @def elm_obj_popup_align_set - * @since 1.8 + * @since 1.9 * * @brief Set the alignment of the popup object relative to its parent * @@ -156,7 +156,7 @@ enum /** * @def elm_obj_popup_align_get - * @since 1.8 + * @since 1.9 * * @brief Return the alignment of the popup object relative to its parent * diff --git a/src/lib/elc_popup_legacy.h b/src/lib/elc_popup_legacy.h index 189bcb264..63d76289c 100644 --- a/src/lib/elc_popup_legacy.h +++ b/src/lib/elc_popup_legacy.h @@ -139,13 +139,14 @@ EAPI Elm_Object_Item *elm_popup_item_append(Evas_Object *obj, const char *label, /** * @brief Set the alignment of the popup object - * * @param obj popup object * @param horizontal The horizontal alignment of the popup * @param vertical The vertical alignment of the popup * * Sets the alignment in which the popup will appear in its parent. * + * @see elm_popup_align_get() + * * @since 1.9 * @ingroup Popup */ @@ -163,4 +164,3 @@ EAPI void elm_popup_align_set(Evas_Object *obj, double horizontal, double vertic * @ingroup Popup */ EAPI void elm_popup_align_get(const Evas_Object *obj, double *horizontal, double *vertical); - |