From e3ff4108b40ba2f39200b7e7029900c8364d56bc Mon Sep 17 00:00:00 2001 From: Jee-Yong Um Date: Fri, 20 Jan 2017 17:36:19 +0900 Subject: [PATCH] entry: Add configuration for the default value of select_allow Signed-Off-By: Jee-Yong Um Change-Id: Ibdd09df96a0a769d733a884bb17c8fac7512c5bf --- src/lib/elm_config.c | 6 ++++++ src/lib/elm_entry.c | 13 +++++++------ src/lib/elm_priv.h | 3 +++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c index fc470e7..9ef14a7 100644 --- a/src/lib/elm_config.c +++ b/src/lib/elm_config.c @@ -472,6 +472,9 @@ _desc_init(void) // automatically according to language setting ELM_CONFIG_VAL(D, T, language_auto_mirrored, T_UCHAR); // + // TIZEN_ONLY(20170120): entry: Add configuration for the default value of select_allow + ELM_CONFIG_VAL(D, T, entry_select_allow, T_UCHAR); + // #undef T #undef D #undef T_INT @@ -1856,6 +1859,9 @@ _config_load(void) // TIZEN_ONLY(20161202): Enable auto mirroring by default _elm_config->language_auto_mirrored = EINA_TRUE; // + // TIZEN_ONLY(20170120): entry: Add configuration for the default value of select_allow + _elm_config->entry_select_allow = EINA_TRUE; + // } static void diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index d9d9d09..d9d3ec3 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -5200,11 +5200,9 @@ _elm_entry_evas_object_smart_add(Eo *obj, Elm_Entry_Data *priv) priv->context_menu = EINA_TRUE; priv->auto_save = EINA_TRUE; priv->editable = EINA_TRUE; -#ifdef TIZEN_PROFILE_WEARABLE - priv->sel_allow = EINA_FALSE; -#else - priv->sel_allow = EINA_TRUE; -#endif + // TIZEN_ONLY(20170120): entry: Add configuration for the default value of select_allow + priv->sel_allow = _elm_config->entry_select_allow; + // priv->drop_format = ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE; ///////////////////////////////////////////////////////////////// @@ -5323,7 +5321,10 @@ _elm_entry_evas_object_smart_add(Eo *obj, Elm_Entry_Data *priv) elm_object_sub_cursor_set (wd->resize_obj, obj, ELM_CURSOR_XTERM); elm_widget_can_focus_set(obj, EINA_TRUE); - if (_elm_config->desktop_entry) + // TIZEN_ONLY(20170120): entry: Add configuration for the default value of select_allow + // if (_elm_config->desktop_entry) + if (priv->sel_allow && _elm_config->desktop_entry) + // edje_object_part_text_select_allow_set (priv->entry_edje, "elm.text", EINA_TRUE); diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h index ec9c50e..f8cf190 100644 --- a/src/lib/elm_priv.h +++ b/src/lib/elm_priv.h @@ -324,6 +324,9 @@ struct _Elm_Config // automatically according to language setting Eina_Bool language_auto_mirrored; // + // TIZEN_ONLY(20170120): entry: Add configuration for the default value of select_allow + unsigned char entry_select_allow; + // /* Not part of the EET file */ Eina_Bool is_mirrored : 1; -- 2.7.4