test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-12-02 12:08:16 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

close keyboard before close a window

Browse Source
This commit is contained in:
xianjimli 2018-10-31 17:01:42 +08:00
parent 1611ec59e4
commit 6fa417e087
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/input_methods/input_method_default.inc
View File

@ -25,6 +25,7 @@
#include "keyboard/keyboard.h"
#include "suggest_words.inc"
#include "base/input_method.h"
#include "base/window_manager.h"
#include "ui_loader/ui_builder_default.h"
static const char* input_type_to_keyboard_name(int32_t input_type) {
@ -69,16 +70,6 @@ static const char* input_type_to_keyboard_name(int32_t input_type) {
return keyboard;
}
static ret_t input_method_on_win_destroy(void* ctx, event_t* e) {
input_method_t* im = (input_method_t*)ctx;
im->widget = NULL;
im->win = NULL;
(void)e;
return RET_REMOVE;
}
static ret_t on_push_window(void* ctx, event_t* e) {
input_method_t* im = (input_method_t*)ctx;
im->win->y -= im->win_delta_y;
@ -97,6 +88,23 @@ static ret_t input_method_default_restore_win_position(input_method_t* im) {
return RET_OK;
}
static ret_t input_method_on_win_close(void* ctx, event_t* e) {
input_method_t* im = (input_method_t*)ctx;
input_method_default_restore_win_position(im);
if (im->keyboard != NULL) {
window_manager_close_window_force(im->keyboard->parent, im->keyboard);
im->keyboard = NULL;
}
im->widget = NULL;
im->win = NULL;
(void)e;
return RET_REMOVE;
}
static ret_t input_type_open_keyboard(input_method_t* im, int32_t input_type, bool_t open_anim) {
value_t v;
point_t p = {0, 0};
@ -129,7 +137,7 @@ static ret_t input_type_open_keyboard(input_method_t* im, int32_t input_type, bo
value_set_str(&v, close_anim_hint);
widget_set_prop(im->keyboard, WIDGET_PROP_CLOSE_ANIM_HINT, &v);
widget_on(win, EVT_DESTROY, input_method_on_win_destroy, im);
widget_on(win, EVT_WINDOW_CLOSE, input_method_on_win_close, im);
return RET_OK;
}