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

improve edit

Browse Source
This commit is contained in:
lixianjing 2021-12-20 10:14:24 +08:00
parent f0aef7587a
commit e42a51d993
2 changed files with 14 additions and 1 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/12/20
* 修复在mvvm中edit控件输入值超过限定值后没有 通知数据层修改数据的问题（感谢智明提供补丁）
2021/12/19
* 支持4bits的点阵字体。请参考[fongen的说明](../tools/font_gen/README.md)

12
src/widgets/edit.c
View File

@ -734,7 +734,16 @@ static ret_t edit_check_valid_value(widget_t* widget) {
return_value_if_fail(widget != NULL && edit != NULL, RET_BAD_PARAMS);
if (!edit_is_valid_value(widget)) {
if (edit->auto_fix) {
wstr_t old_text;
wstr_init(&old_text, 0);
wstr_set(&old_text, widget->text.str);
edit_auto_fix(widget);
if (!wstr_equal(&old_text, &widget->text)) {
edit_dispatch_value_change_event(widget, EVT_VALUE_CHANGED);
}
wstr_reset(&old_text);
} else if (widget->text.size > 0) {
widget_set_state(widget, WIDGET_STATE_ERROR);
}
@ -880,6 +889,7 @@ ret_t edit_on_event(widget_t* widget, event_t* e) {
case EVT_IM_ACTION: {
if (tk_str_eq(edit->action_text, ACTION_TEXT_DONE)) {
edit->is_key_inputing = FALSE;
edit_check_valid_value(widget);
input_method_request(input_method(), NULL);
} else if (tk_str_eq(edit->action_text, ACTION_TEXT_NEXT)) {
widget_focus_next(widget);
@ -1277,7 +1287,7 @@ ret_t edit_get_prop(widget_t* widget, const char* name, value_t* v) {
return RET_OK;
} else if (tk_str_eq(name, WIDGET_PROP_INPUTING)) {
input_method_t* im = input_method();
bool_t inputing = im != NULL && im->widget == widget || edit->is_key_inputing;
bool_t inputing = (im != NULL && im->widget == widget) || edit->is_key_inputing;
/* 当控件没有父集窗口或者父集窗口没有打开的时候，通过 focused 来判断是否正在输入 */
if (!inputing && !widget_is_window_opened(widget)) {
inputing = widget->focused;