From 8a0156895388e934054fc8507b216ded4753a1ac Mon Sep 17 00:00:00 2001 From: Bartlomiej Uliasz Date: Mon, 5 Dec 2016 10:48:49 +0100 Subject: [PATCH] view: Fixed bugs found by Svace Change-Id: I8e490335e84d5b17bc1346387980fc3161cc52a9 Signed-off-by: Bartlomiej Uliasz --- src/view/view_base.c | 67 +++++++++++++++++++++++++++++---------------- src/view/view_new_network.c | 2 +- 2 files changed, 44 insertions(+), 25 deletions(-) diff --git a/src/view/view_base.c b/src/view/view_base.c index ce3120b..82a1c5e 100755 --- a/src/view/view_base.c +++ b/src/view/view_base.c @@ -156,9 +156,9 @@ static void _lock_focus_for_item(struct _priv *priv, int item, Eina_Bool lock) elm_object_focus_next_object_set(priv->menu[item], priv->menu[item], ELM_FOCUS_RIGHT); } else { if (item > 0) - elm_object_focus_next_object_set(priv->menu[item], priv->menu[item-1], ELM_FOCUS_LEFT); + elm_object_focus_next_object_set(priv->menu[item], priv->menu[item - 1], ELM_FOCUS_LEFT); if (item < LAYOUT_MAX - 1) - elm_object_focus_next_object_set(priv->menu[item], priv->menu[item+1], ELM_FOCUS_RIGHT); + elm_object_focus_next_object_set(priv->menu[item], priv->menu[item + 1], ELM_FOCUS_RIGHT); } } @@ -208,7 +208,8 @@ static void _set_reorder_mode(void *data, Eina_Bool mode) update_type, NULL); } -static void _swap_menu_items(struct _priv *priv, int item1, int item2, Eina_Bool move_right) +static void _swap_menu_items(struct _priv *priv, int item1, int item2, + Eina_Bool move_right) { struct _menu_data *temp = NULL; Evas_Object *temp_item = NULL; @@ -221,10 +222,12 @@ static void _swap_menu_items(struct _priv *priv, int item1, int item2, Eina_Bool if (move_right) { elm_box_unpack(priv->box, priv->menu[item1]); - elm_box_pack_after(priv->box, priv->menu[item1], priv->menu[item2]); + elm_box_pack_after(priv->box, priv->menu[item1], + priv->menu[item2]); } else { elm_box_unpack(priv->box, priv->menu[item2]); - elm_box_pack_before(priv->box, priv->menu[item2], priv->menu[item1]); + elm_box_pack_before(priv->box, priv->menu[item2], + priv->menu[item1]); } inputmgr_remove_callback(priv->menu[item1], &_menu_input_handler); @@ -238,19 +241,31 @@ static void _swap_menu_items(struct _priv *priv, int item1, int item2, Eina_Bool _mdata_p[item1] = _mdata_p[item2]; _mdata_p[item2] = temp; - if(item1>0) elm_object_focus_next_object_set(priv->menu[item1 - 1], priv->menu[item1], ELM_FOCUS_RIGHT); - elm_object_focus_next_object_set(priv->menu[item1], priv->menu[item2], ELM_FOCUS_RIGHT); - if(item2menu[item2], priv->menu[item2+1], ELM_FOCUS_RIGHT); - - if(item2menu[item2+1], priv->menu[item2], ELM_FOCUS_LEFT); - elm_object_focus_next_object_set(priv->menu[item2], priv->menu[item1], ELM_FOCUS_LEFT); - if(item1>0) elm_object_focus_next_object_set(priv->menu[item1], priv->menu[item1-1], ELM_FOCUS_LEFT); - - inputmgr_add_callback(priv->menu[item1], item1, &_menu_input_handler, priv); - inputmgr_add_callback(priv->menu[item2], item2, &_menu_input_handler, priv); -/*release changes:*/ -//settings_preferences_tab_order_set(item1, _mdata_p[item1]->layout_id); -//settings_preferences_tab_order_set(item2, _mdata_p[item2]->layout_id); + if (item1 > 0) + elm_object_focus_next_object_set(priv->menu[item1 - 1], + priv->menu[item1], ELM_FOCUS_RIGHT); + elm_object_focus_next_object_set(priv->menu[item1], priv->menu[item2], + ELM_FOCUS_RIGHT); + if (item2 < LAYOUT_MAX - 1) + elm_object_focus_next_object_set(priv->menu[item2], + priv->menu[item2 + 1], ELM_FOCUS_RIGHT); + + if (item2 < LAYOUT_MAX - 1) + elm_object_focus_next_object_set(priv->menu[item2 + 1], + priv->menu[item2], ELM_FOCUS_LEFT); + elm_object_focus_next_object_set(priv->menu[item2], priv->menu[item1], + ELM_FOCUS_LEFT); + if (item1 > 0) + elm_object_focus_next_object_set(priv->menu[item1], + priv->menu[item1 - 1], ELM_FOCUS_LEFT); + + inputmgr_add_callback(priv->menu[item1], item1, &_menu_input_handler, + priv); + inputmgr_add_callback(priv->menu[item2], item2, &_menu_input_handler, + priv); + /*release changes:*/ + //settings_preferences_tab_order_set(item1, _mdata_p[item1]->layout_id); + //settings_preferences_tab_order_set(item2, _mdata_p[item2]->layout_id); } static void _show_toast_message(Evas_Object *parent, char *text) @@ -258,7 +273,7 @@ static void _show_toast_message(Evas_Object *parent, char *text) Evas_Object *layout = NULL; static Evas_Object *popup = NULL; - if(popup) { + if (popup) { evas_object_del(popup); } @@ -345,7 +360,7 @@ static void _menu_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, return; } - if(priv->reorder_mode_on) { + if (priv->reorder_mode_on) { if (!strcmp(ev->keyname, KEY_ENTER) || !strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)) { _set_reorder_mode(priv, EINA_FALSE); @@ -354,13 +369,13 @@ static void _menu_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, if (priv->cur_menu == 0) return; - _swap_menu_items(priv, priv->cur_menu-1, priv->cur_menu, EINA_TRUE); + _swap_menu_items(priv, priv->cur_menu - 1, priv->cur_menu, EINA_TRUE); priv->cur_menu--; } else if (!strcmp(ev->keyname, KEY_RIGHT)) { - if (priv->cur_menu == LAYOUT_MAX-1) + if (priv->cur_menu == LAYOUT_MAX - 1) return; - _swap_menu_items(priv, priv->cur_menu, priv->cur_menu+1, EINA_FALSE); + _swap_menu_items(priv, priv->cur_menu, priv->cur_menu + 1, EINA_FALSE); priv->cur_menu++; } } @@ -400,6 +415,10 @@ static void _menu_focused_cb(int id, void *data, Evas_Object *obj, if (priv->menu[j] == obj) i = j; } + if (i < 0) { + _ERR("Index not found"); + return; + } if (i == priv->cur_menu) { layoutmgr_update_layout(priv->lmgr, _mdata[i].layout_id, @@ -445,7 +464,7 @@ static void _tab_order_restore(void) int i = 0; for(i = 0; i < LAYOUT_MAX; ++i) { - if(!settings_preferences_tab_order_get(i, &layout_id)) { + if (!settings_preferences_tab_order_get(i, &layout_id)) { settings_preferences_tab_order_set(i, _mdata[i].layout_id); } else { found_md = _find_layout_by_id(layout_id); diff --git a/src/view/view_new_network.c b/src/view/view_new_network.c index f7875b3..b850b30 100644 --- a/src/view/view_new_network.c +++ b/src/view/view_new_network.c @@ -1338,7 +1338,7 @@ static void _destroy(void *data) } if (priv->btn_manual) { inputmgr_remove_callback(priv->btn_manual, &_menu_btn_input_handler); - evas_object_del(priv->btn_automatic); + evas_object_del(priv->btn_manual); } if (priv->btn_cancel) { inputmgr_remove_callback(priv->btn_cancel, &_menu_btn_input_handler); -- 2.7.4