From da3eea219eca3b135d0daad7088a38dd63c83c72 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Mon, 6 Apr 2020 19:06:51 +0900 Subject: [PATCH] elm_spinner: Prevent to create inc/dec button in list spinner. There is no inc/dec button in list spinner UX @tizen_feature Change-Id: Ic4eff7193f2b782c29d27037164c002f06def200 --- src/lib/elementary/elm_spinner.c | 50 ++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 3c6179a..36bc388 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -1934,20 +1934,25 @@ _elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv) if (sd->button_layout) { - priv->inc_button = elm_button_add(obj); + //TIZEN_ONLY(20200406): We don't need create inc/dec button on list spinner. + if (!priv->list_spinner) + // + { + priv->inc_button = elm_button_add(obj); - /* TIZEN_ONLY(20161115): apply UI Mirroring for Tizen 3.0 UX. - buttons inside a spinner are not mirrored */ - elm_object_mirrored_automatic_set(priv->inc_button, EINA_FALSE); - elm_object_mirrored_set(priv->inc_button, EINA_FALSE); - /* END */ + /* TIZEN_ONLY(20161115): apply UI Mirroring for Tizen 3.0 UX. + buttons inside a spinner are not mirrored */ + elm_object_mirrored_automatic_set(priv->inc_button, EINA_FALSE); + elm_object_mirrored_set(priv->inc_button, EINA_FALSE); + /* END */ - elm_object_style_set(priv->inc_button, "spinner/increase/default"); + elm_object_style_set(priv->inc_button, "spinner/increase/default"); - efl_event_callback_array_add(priv->inc_button, _inc_dec_button_cb(), obj); + efl_event_callback_array_add(priv->inc_button, _inc_dec_button_cb(), obj); - elm_layout_content_set(obj, "elm.swallow.inc_button", priv->inc_button); - elm_widget_sub_object_add(obj, priv->inc_button); + elm_layout_content_set(obj, "elm.swallow.inc_button", priv->inc_button); + elm_widget_sub_object_add(obj, priv->inc_button); + } priv->text_button = elm_button_add(obj); @@ -1992,19 +1997,24 @@ _elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv) } // - priv->dec_button = elm_button_add(obj); - /* TIZEN_ONLY(20161115): apply UI Mirroring for Tizen 3.0 UX. - buttons inside a spinner are not mirrored */ - elm_object_mirrored_automatic_set(priv->dec_button, EINA_FALSE); - elm_object_mirrored_set(priv->dec_button, EINA_FALSE); - /* END */ + //TIZEN_ONLY(20200406): We don't need create inc/dec button on list spinner. + if (!priv->list_spinner) + // + { + priv->dec_button = elm_button_add(obj); + /* TIZEN_ONLY(20161115): apply UI Mirroring for Tizen 3.0 UX. + buttons inside a spinner are not mirrored */ + elm_object_mirrored_automatic_set(priv->dec_button, EINA_FALSE); + elm_object_mirrored_set(priv->dec_button, EINA_FALSE); + /* END */ - elm_object_style_set(priv->dec_button, "spinner/decrease/default"); + elm_object_style_set(priv->dec_button, "spinner/decrease/default"); - efl_event_callback_array_add(priv->dec_button, _inc_dec_button_cb(), obj); + efl_event_callback_array_add(priv->dec_button, _inc_dec_button_cb(), obj); - elm_layout_content_set(obj, "elm.swallow.dec_button", priv->dec_button); - elm_widget_sub_object_add(obj, priv->dec_button); + elm_layout_content_set(obj, "elm.swallow.dec_button", priv->dec_button); + elm_widget_sub_object_add(obj, priv->dec_button); + } { Eina_List *items = NULL; -- 2.7.4