|
From: Enlightenment G. <no-...@en...> - 2013-02-13 16:13:02
|
The branch, master has been updated This change consists of the following commits: 9dbc794 ChunEon Park: elementary/win - removed duplicated logic. d73043d ChunEon Park: elementary/widget - for consistency, revised internal func names. bb3c5cf Jihoon Kim: elm: sync with AUTHOR 4c63349 Carsten Haitzler: unbreak hermet commit. :) Summary of changes: src/lib/elm_authors.h | 1 + src/lib/elm_general.h | 2 +- src/lib/elm_main.c | 4 ++-- src/lib/elm_widget.c | 22 +++++++++++----------- src/lib/elm_widget.h | 12 ++++++------ src/lib/elm_win.c | 30 ++++++++++++------------------ 6 files changed, 33 insertions(+), 38 deletions(-) ----------------------------------------------------------------------- http://git.enlightenment.org/core/elementary.git/commit/?id=9dbc794ef1a823121d8bcff189f97de046d68e2b commit 9dbc794ef1a823121d8bcff189f97de046d68e2b Author: ChunEon Park <he...@he...> Date: Wed Feb 13 11:47:51 2013 +0000 elementary/win - removed duplicated logic. SVN revision: 83868 diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index ebd7402..6d65d7d 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -4219,15 +4219,13 @@ elm_win_rotation_set(Evas_Object *obj, } static void -_rotation_set(Eo *obj, void *_pd, va_list *list) +_win_rotate(Evas_Object *obj, Elm_Win_Smart_Data *sd, int rotation, Eina_Bool resize) { - int rotation = va_arg(*list, int); - Elm_Win_Smart_Data *sd = _pd; - rotation = _win_rotation_degree_check(rotation); if (sd->rot == rotation) return; sd->rot = rotation; - TRAP(sd, rotation_set, rotation); + if (resize) TRAP(sd, rotation_with_resize_set, rotation); + else TRAP(sd, rotation_set, rotation); evas_object_size_hint_min_set(obj, -1, -1); evas_object_size_hint_max_set(obj, -1, -1); _elm_win_resize_objects_eval(obj); @@ -4237,6 +4235,14 @@ _rotation_set(Eo *obj, void *_pd, va_list *list) evas_object_smart_callback_call(obj, SIG_ROTATION_CHANGED, NULL); } +static void +_rotation_set(Eo *obj, void *_pd, va_list *list) +{ + int rotation = va_arg(*list, int); + Elm_Win_Smart_Data *sd = _pd; + _win_rotate(obj, sd, rotation, EINA_FALSE); +} + EAPI void elm_win_rotation_with_resize_set(Evas_Object *obj, int rotation) @@ -4250,19 +4256,7 @@ _rotation_with_resize_set(Eo *obj, void *_pd, va_list *list) { int rotation = va_arg(*list, int); Elm_Win_Smart_Data *sd = _pd; - - rotation = _win_rotation_degree_check(rotation); - if (sd->rot == rotation) return; - sd->rot = rotation; - TRAP(sd, rotation_with_resize_set, rotation); - evas_object_size_hint_min_set(obj, -1, -1); - evas_object_size_hint_max_set(obj, -1, -1); - _elm_win_resize_objects_eval(obj); - -#ifdef HAVE_ELEMENTARY_X - _elm_win_xwin_update(sd); -#endif - evas_object_smart_callback_call(obj, SIG_ROTATION_CHANGED, NULL); + _win_rotate(obj, sd, rotation, EINA_TRUE); } EAPI int http://git.enlightenment.org/core/elementary.git/commit/?id=d73043d2bee304c4f214be6235a647833c845359 commit d73043d2bee304c4f214be6235a647833c845359 Author: ChunEon Park <he...@he...> Date: Wed Feb 13 11:02:36 2013 +0000 elementary/widget - for consistency, revised internal func names. SVN revision: 83865 diff --git a/src/lib/elm_general.h b/src/lib/elm_general.h index 8ac4d35..620ceb7 100644 --- a/src/lib/elm_general.h +++ b/src/lib/elm_general.h @@ -317,7 +317,7 @@ EAPI int elm_policy_get(unsigned int policy); * * Changing language with this function will make Elementary run through * all its widgets, translating strings set with - * elm_object_domain_translatable_text_part_set(). This way, an entire + * elm_object_domain_translatable_part_text_set(). This way, an entire * UI can have its language changed without having to restart the program. * * For more complex cases, like having formatted strings that need diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index c67a12d..99b6064 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -1074,14 +1074,14 @@ EAPI void elm_object_part_text_set(Evas_Object *obj, const char *part, const char *label) { EINA_SAFETY_ON_NULL_RETURN(obj); - elm_widget_text_part_set(obj, part, label); + elm_widget_part_text_set(obj, part, label); } EAPI const char * elm_object_part_text_get(const Evas_Object *obj, const char *part) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); - return elm_widget_text_part_get(obj, part); + return elm_widget_part_text_get(obj, part); } EAPI void diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index d746764..2b16501 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -3568,16 +3568,16 @@ _elm_widget_theme_set(Eo *obj, void *_pd, va_list *list) } EAPI void -elm_widget_text_part_set(Evas_Object *obj, +elm_widget_part_text_set(Evas_Object *obj, const char *part, const char *label) { ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_text_part_set(part, label)); + eo_do(obj, elm_wdg_part_text_set(part, label)); } static void -_elm_widget_text_part_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +_elm_widget_part_text_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) { const char *part = va_arg(*list, const char *); const char *label = va_arg(*list, const char *); @@ -3586,17 +3586,17 @@ _elm_widget_text_part_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) } EAPI const char * -elm_widget_text_part_get(const Evas_Object *obj, +elm_widget_part_text_get(const Evas_Object *obj, const char *part) { ELM_WIDGET_CHECK(obj) NULL; const char *ret = NULL; - eo_do((Eo *) obj, elm_wdg_text_part_get(part, &ret)); + eo_do((Eo *) obj, elm_wdg_part_text_get(part, &ret)); return ret; } static void -_elm_widget_text_part_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +_elm_widget_part_text_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) { const char *part = va_arg(*list, const char *); const char **ret = va_arg(*list, const char **); @@ -3678,7 +3678,7 @@ _elm_widget_domain_translatable_part_text_set(Eo *obj, void *_pd, va_list *list) if (label && label[0]) label = dgettext(domain, label); #endif - elm_widget_text_part_set(obj, part, label); + elm_widget_part_text_set(obj, part, label); } EAPI const char * @@ -3745,7 +3745,7 @@ _elm_widget_translate(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list EINA_LIST_FOREACH(sd->translate_strings, l, ts) { const char *s = dgettext(ts->domain, ts->string); - elm_widget_text_part_set(obj, ts->id, s); + elm_widget_part_text_set(obj, ts->id, s); } #endif } @@ -5484,8 +5484,8 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SCALE_SET), _elm_widget_scale_set), EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SCALE_GET), _elm_widget_scale_get), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_SET), _elm_widget_text_part_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_GET), _elm_widget_text_part_get), + EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_SET), _elm_widget_part_text_set), + EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_GET), _elm_widget_part_text_get), EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DOMAIN_TRANSLATABLE_PART_TEXT_SET), _elm_widget_domain_translatable_part_text_set), EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATABLE_PART_TEXT_GET), _elm_widget_translatable_part_text_get), EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS_INFO_SET), _elm_widget_access_info_set), diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h index 4e51795..a0b4bda 100644 --- a/src/lib/elm_widget.h +++ b/src/lib/elm_widget.h @@ -682,8 +682,8 @@ EAPI void elm_widget_focus_tree_unfocusable_handle(Evas_Object *obj) EAPI void elm_widget_focus_disabled_handle(Evas_Object *obj); EAPI unsigned int elm_widget_focus_order_get(const Evas_Object *obj); EAPI void elm_widget_activate(Evas_Object *obj, Elm_Activate act); -EAPI void elm_widget_text_part_set(Evas_Object *obj, const char *part, const char *label); -EAPI const char *elm_widget_text_part_get(const Evas_Object *obj, const char *part); +EAPI void elm_widget_part_text_set(Evas_Object *obj, const char *part, const char *label); +EAPI const char *elm_widget_part_text_get(const Evas_Object *obj, const char *part); EAPI void elm_widget_domain_translatable_part_text_set(Evas_Object *obj, const char *part, const char *domain, const char *text); EAPI const char *elm_widget_translatable_part_text_get(const Evas_Object *obj, const char *part); EAPI void elm_widget_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content); @@ -1774,7 +1774,7 @@ typedef void * (*list_data_get_func_type)(const Eina_List * l); /** - * @def elm_wdg_text_part_set + * @def elm_wdg_part_text_set * @since 1.8 * * No description supplied by the EAPI. @@ -1783,10 +1783,10 @@ typedef void * (*list_data_get_func_type)(const Eina_List * l); * @param[in] label * */ -#define elm_wdg_text_part_set(part, label) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_SET), EO_TYPECHECK(const char *, part), EO_TYPECHECK(const char *, label) +#define elm_wdg_part_text_set(part, label) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_SET), EO_TYPECHECK(const char *, part), EO_TYPECHECK(const char *, label) /** - * @def elm_wdg_text_part_get + * @def elm_wdg_part_text_get * @since 1.8 * * No description supplied by the EAPI. @@ -1795,7 +1795,7 @@ typedef void * (*list_data_get_func_type)(const Eina_List * l); * @param[out] ret * */ -#define elm_wdg_text_part_get(part, ret) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_GET), EO_TYPECHECK(const char *, part), EO_TYPECHECK(const char **, ret) +#define elm_wdg_part_text_get(part, ret) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_GET), EO_TYPECHECK(const char *, part), EO_TYPECHECK(const char **, ret) /** http://git.enlightenment.org/core/elementary.git/commit/?id=bb3c5cfbeed2984d08ab85928d201c8fa024f2ee commit bb3c5cfbeed2984d08ab85928d201c8fa024f2ee Author: Jihoon Kim <imf...@gm...> Date: Tue Feb 12 23:27:04 2013 +0000 elm: sync with AUTHOR SVN revision: 83861 diff --git a/src/lib/elm_authors.h b/src/lib/elm_authors.h index df75fb1..d86d24e 100644 --- a/src/lib/elm_authors.h +++ b/src/lib/elm_authors.h @@ -77,6 +77,7 @@ * @author JaeHyun Jo <jae_hyun_cho@@naver.com> * @author Bora Hwang <bora1.hwang@@samsung.com> * @author Jiyoung Choi <jychoi7.choi@@samsung.com> + * @author Arvind R <arvino55@@gmail.com> * * Please contact <enl...@li...> to get in * contact with the developers and maintainers. http://git.enlightenment.org/core/elementary.git/commit/?id=4c63349dac7e184b903c02ec728305a2c1ec3c40 commit 4c63349dac7e184b903c02ec728305a2c1ec3c40 Author: Carsten Haitzler <ra...@ra...> Date: Tue Feb 12 22:04:30 2013 +0000 unbreak hermet commit. :) SVN revision: 83860 diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index d140923..d746764 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -5228,7 +5228,7 @@ _elm_widget_item_translate(Elm_Widget_Item *item) EINA_LIST_FOREACH(item->translate_strings, l, ts) { const char *s = dgettext(ts->domain, ts->string); - _elm_widget_item_part_text_set(it, ts->id, s); + _elm_widget_item_part_text_set(item, ts->id, s); } #endif } ----------------------------------------------------------------------- -- EFL widget toolkit (TESTING RO) |