diff options
Diffstat (limited to 'src/ui-callback.c')
| -rwxr-xr-x | src/ui-callback.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/ui-callback.c b/src/ui-callback.c index bd53fb3..fa9a6ea 100755 --- a/src/ui-callback.c +++ b/src/ui-callback.c @@ -32,12 +32,15 @@ void pwlock_greeting_next_cb(void *data, Evas_Object *obj, void *e) { if (!ad) return; + if (ad->state != _ST_GREETING) + return; + ad->btn_evt_state = BUTTON_STATE_NEXT_CLICKED; if (ad->is_no_sim == 1) { do_state_directly(_ST_NOSIM, ad); } else { - do_state_directly(_ST_TIME, ad); + do_state_directly(_ST_CONNECTION, ad); } } @@ -60,7 +63,7 @@ void pwlock_nosim_skip_cb(void *data, Evas_Object * obj, void *e) { return; ad->btn_evt_state = BUTTON_STATE_NEXT_CLICKED; - do_state_directly(_ST_TIME, ad); + do_state_directly(_ST_CONNECTION, ad); } void pwlock_tutorial_prev_cb(void *data, Evas_Object *obj, void *e) { @@ -105,8 +108,8 @@ void pwlock_ug_connection_layout_cb(ui_gadget_h ug, enum ug_mode mode, case UG_MODE_FULLVIEW: evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(ug_get_window(), base); - //ug_disable_effect(ug); + //elm_win_resize_object_add(ug_get_window(), base); + ug_disable_effect(ug); evas_object_show(base); ad->wifi_ug_layout = base; break; @@ -153,6 +156,8 @@ void pwlock_ug_connection_destroy_cb(ui_gadget_h ug, void *priv) { ug = NULL; } + ad->wifi_ug_loaded = 0; + _DBG("ad->btn_evt_state=%d", ad->btn_evt_state); switch (ad->btn_evt_state) { @@ -160,7 +165,11 @@ void pwlock_ug_connection_destroy_cb(ui_gadget_h ug, void *priv) { do_state_directly(_ST_FINISH, ad); break; case BUTTON_STATE_PREV_CLICKED: - do_state_directly(_ST_TIME, ad); + if (ad->is_no_sim == 1) { + do_state_directly(_ST_NOSIM, ad); + } else { + do_state_directly(_ST_GREETING, ad); + } break; case BUTTON_STATE_NONE: break; |