From fd1707d819ca43cb5c9cee2222508081575b2b81 Mon Sep 17 00:00:00 2001 From: taehyub Date: Mon, 7 Dec 2015 15:53:47 -0800 Subject: [PATCH] popup: add popup default align config for other profiles. Summary: The alignment of popup can be different in each profiles. So I added the align configuration of popup. @feature Reviewers: cedric, woohyun Differential Revision: https://phab.enlightenment.org/D3357 Change-Id: I5c86f51236c2136e1a9bb88febc973e008ca505a Signed-off-by: Cedric BAIL --- config/default/base.src.in | 2 ++ config/mobile/base.src.in | 2 ++ config/standard/base.src.in | 2 ++ src/lib/elc_popup.c | 5 ++++- src/lib/elm_config.c | 11 ++++++++++- src/lib/elm_priv.h | 2 ++ 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/config/default/base.src.in b/config/default/base.src.in index 5caff3d..188f41f 100644 --- a/config/default/base.src.in +++ b/config/default/base.src.in @@ -95,6 +95,8 @@ group "Elm_Config" struct { value "win_auto_focus_animate" uchar: 1; value "transition_duration_factor" double: 1.0; value "naviframe_prev_btn_auto_pushed" uchar: 1; + value "popup_horizontal_align" double: 0.5; + value "popup_vertical_align" double: 0.5; group "color_palette" list { group "Elm_Custom_Palette" struct { value "palette_name" string: "default"; diff --git a/config/mobile/base.src.in b/config/mobile/base.src.in index 6621fb8..aea7ae2 100644 --- a/config/mobile/base.src.in +++ b/config/mobile/base.src.in @@ -99,6 +99,8 @@ group "Elm_Config" struct { value "win_auto_focus_animate" uchar: 1; value "transition_duration_factor" double: 1.0; value "naviframe_prev_btn_auto_pushed" uchar: 1; + value "popup_horizontal_align" double: 0.5; + value "popup_vertical_align" double: 0.5; group "color_palette" list { group "Elm_Custom_Palette" struct { value "palette_name" string: "default"; diff --git a/config/standard/base.src.in b/config/standard/base.src.in index a89beba..2d87884 100644 --- a/config/standard/base.src.in +++ b/config/standard/base.src.in @@ -96,6 +96,8 @@ group "Elm_Config" struct { value "win_auto_focus_animate" uchar: 1; value "transition_duration_factor" double: 1.0; value "naviframe_prev_btn_auto_pushed" uchar: 1; + value "popup_horizontal_align" double: 0.5; + value "popup_vertical_align" double: 0.5; group "color_palette" list { group "Elm_Custom_Palette" struct { value "palette_name" string: "default"; diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c index 228ef1d..31b8500 100644 --- a/src/lib/elc_popup.c +++ b/src/lib/elc_popup.c @@ -1570,7 +1570,10 @@ _elm_popup_evas_object_smart_add(Eo *obj, Elm_Popup_Data *priv) priv->notify = elm_notify_add(obj); elm_object_style_set(priv->notify, style); - elm_notify_align_set(priv->notify, 0.5, 0.5); + + elm_notify_align_set(priv->notify, + _elm_config->popup_horizontal_align, + _elm_config->popup_vertical_align); elm_notify_allow_events_set(priv->notify, EINA_FALSE); evas_object_size_hint_weight_set (priv->notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c index 80964f7..7ee67eb 100644 --- a/src/lib/elm_config.c +++ b/src/lib/elm_config.c @@ -436,6 +436,8 @@ _desc_init(void) ELM_CONFIG_VAL(D, T, win_auto_focus_animate, T_UCHAR); ELM_CONFIG_VAL(D, T, transition_duration_factor, T_DOUBLE); ELM_CONFIG_VAL(D, T, naviframe_prev_btn_auto_pushed, T_UCHAR); + ELM_CONFIG_VAL(D, T, popup_horizontal_align, T_DOUBLE); + ELM_CONFIG_VAL(D, T, popup_vertical_align, T_DOUBLE); #undef T #undef D #undef T_INT @@ -1466,6 +1468,8 @@ _config_load(void) _elm_config->gl_stencil = 0; _elm_config->transition_duration_factor = 1.0; _elm_config->naviframe_prev_btn_auto_pushed = EINA_TRUE; + _elm_config->popup_horizontal_align = 0.5; + _elm_config->popup_vertical_align = 0.5; } static void @@ -2144,6 +2148,11 @@ _env_get(void) s = getenv("ELM_TRANSITION_DURATION_FACTOR"); if (s) _elm_config->transition_duration_factor = atof(s); + + s = getenv("ELM_POPUP_HORIZONTAL_ALIGN"); + if (s) _elm_config->popup_horizontal_align = _elm_atof(s); + s = getenv("ELM_POPUP_VERTICAL_ALIGN"); + if (s) _elm_config->popup_vertical_align = _elm_atof(s); } static void @@ -3692,4 +3701,4 @@ EAPI void elm_finger_size_set(Evas_Coord size) { elm_config_finger_size_set(size); -} \ No newline at end of file +} diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h index 18f334a..7a1a8d5 100644 --- a/src/lib/elm_priv.h +++ b/src/lib/elm_priv.h @@ -236,6 +236,8 @@ struct _Elm_Config unsigned char first_item_focus_on_first_focus_in; /**< This sets the first item focus on first focus in feature*/ Elm_Focus_Autoscroll_Mode focus_autoscroll_mode; /**< This shows the focus auto scroll mode. By default, @c ELM_FOCUS_AUTOSCROLL_MODE_SHOW is set. */ Elm_Slider_Indicator_Visible_Mode slider_indicator_visible_mode; /**< this sets the slider indicator visible mode */ + double popup_horizontal_align; + double popup_vertical_align; int toolbar_shrink_mode; unsigned char fileselector_expand_enable; unsigned char fileselector_double_tap_navigation_enable; -- 2.7.4