From 997f4d1281474fd08ab132ad79ba77502276b3f3 Mon Sep 17 00:00:00 2001 From: Priya Kohli Date: Wed, 10 May 2017 18:51:11 +0530 Subject: [PATCH] Changes for focus in New Network UI Indentation fixes. Signed-off-by: Priya Kohli Change-Id: Ieb857f1c8d4bff7f4c57e7f5b2eda453c4eeb222 --- src/view/view_new_network.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/view/view_new_network.c b/src/view/view_new_network.c index c7ccdce..a9ae33d 100644 --- a/src/view/view_new_network.c +++ b/src/view/view_new_network.c @@ -1214,7 +1214,7 @@ static bool _draw_config_buttons(struct _priv *priv) Evas_Object *ip_btn, *dns_btn; ip_btn = utils_add_button(priv->content_manual->layout_content_ip, "part.ip.type", - STYLE_OPTION_BTN, str_config_type_opt[priv->config_cur_type]); + STYLE_OPTION_BTN, str_config_type_opt[priv->config_cur_type]); if (!ip_btn) { _ERR("Add button failed."); return false; @@ -1224,17 +1224,24 @@ static bool _draw_config_buttons(struct _priv *priv) inputmgr_add_callback(ip_btn, 0, &_ipconfig_type_option_input_handler, priv); priv->ip_type_btn = ip_btn; - dns_btn = utils_add_button(priv->content_manual->layout_content_dns, "part.dns.type", - STYLE_OPTION_BTN, str_config_type_opt[priv->config_cur_type]); - if (!dns_btn) { - _ERR("Add button failed."); - return false; - } - evas_object_show(dns_btn); - elm_object_focus_next_object_set(dns_btn, dns_btn, ELM_FOCUS_DOWN); - inputmgr_add_callback(dns_btn, 0, &_dnsconfig_type_option_input_handler, priv); - priv->dns_type_btn = dns_btn; - + dns_btn = utils_add_button(priv->content_manual->layout_content_dns, "part.dns.type", + STYLE_OPTION_BTN, str_config_type_opt[priv->config_cur_type]); + if (!dns_btn) { + _ERR("Add button failed."); + return false; + } + evas_object_show(dns_btn); + elm_object_focus_next_object_set(dns_btn, dns_btn, ELM_FOCUS_DOWN); + inputmgr_add_callback(dns_btn, 0, &_dnsconfig_type_option_input_handler, priv); + priv->dns_type_btn = dns_btn; + + elm_object_focus_set(priv->ip_type_btn, EINA_TRUE); + elm_object_focus_next_object_set(priv->ip_type_btn, priv->dns_type_btn, ELM_FOCUS_RIGHT); + elm_object_focus_next_object_set(priv->dns_type_btn, priv->ip_type_btn, ELM_FOCUS_LEFT); + elm_object_focus_next_object_set(priv->ip_type_btn, priv->btn_cancel, ELM_FOCUS_DOWN); + elm_object_focus_next_object_set(priv->btn_cancel, priv->ip_type_btn, ELM_FOCUS_UP); + elm_object_focus_next_object_set(priv->dns_type_btn, priv->btn_done, ELM_FOCUS_DOWN); + elm_object_focus_next_object_set(priv->btn_done, priv->dns_type_btn, ELM_FOCUS_UP); return true; } -- 2.7.4