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

improve edit

Browse Source
This commit is contained in:
lixianjing 2021-11-26 16:55:23 +08:00
parent b1c1276948
commit fe73aee849
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changes.md
View File

@ -1,5 +1,8 @@
# 最新动态
2021/11/26
* edit回车切换到下一个焦点。
2021/11/25
* 修复部分宏拼写错误（感谢兆坤提供补丁）
* 修复API注释错误。

29
src/widgets/edit.c
View File

@ -46,6 +46,7 @@
static ret_t edit_auto_fix(widget_t* widget);
static ret_t edit_reset_layout(widget_t* widget);
static ret_t edit_update_status(widget_t* widget);
static ret_t edit_check_valid_value(widget_t* widget);
static ret_t edit_pre_input(widget_t* widget, uint32_t key);
static ret_t edit_select_all_async(const idle_info_t* info);
@ -541,6 +542,21 @@ static ret_t edit_request_input_method(widget_t* widget) {
return RET_OK;
}
static ret_t edit_on_blur(widget_t* widget) {
edit_t* edit = EDIT(widget);
return_value_if_fail(edit != NULL, RET_BAD_PARAMS);
if (edit->close_im_when_blured) {
input_method_request(input_method(), NULL);
}
edit_update_status(widget);
edit_check_valid_value(widget);
text_edit_preedit_confirm(edit->model);
text_edit_unselect(edit->model);
edit_dispatch_value_change_event(widget, EVT_VALUE_CHANGED);
edit_commit_text(widget);
return RET_OK;
}
static ret_t edit_on_focused(widget_t* widget) {
edit_t* edit = EDIT(widget);
return_value_if_fail(edit != NULL, RET_BAD_PARAMS);
@ -688,6 +704,9 @@ static ret_t edit_on_key_up(widget_t* widget, key_event_t* e) {
if (key_code_is_enter(key)) {
if (edit->timer_id == TK_INVALID_ID) {
edit_on_focused(widget);
} else {
widget_focus_next(widget);
widget_set_focused(widget, FALSE);
}
ret = RET_STOP;
} else {
@ -824,15 +843,7 @@ ret_t edit_on_event(widget_t* widget, event_t* e) {
break;
}
case EVT_BLUR: {
if (edit->close_im_when_blured) {
input_method_request(input_method(), NULL);
}
edit_update_status(widget);
edit_check_valid_value(widget);
text_edit_preedit_confirm(edit->model);
text_edit_unselect(edit->model);
edit_dispatch_value_change_event(widget, EVT_VALUE_CHANGED);
edit_commit_text(widget);
edit_on_blur(widget);
break;
}
case EVT_FOCUS: {