test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-29 18:48:09 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

improve edit wheel event

Browse Source
This commit is contained in:
lixianjing 2024-09-14 11:40:59 +08:00
parent 9e15e17fdb
commit 060e08884b
2 changed files with 14 additions and 8 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 @@
# 最新动态
2024/09/14
* edit控件得到焦点时才响应鼠标滚轮事件(感谢雨欣提供补丁)
2024/09/09
* 修复打开窗口后立马关闭窗口导致焦点丢失的问(感谢智明提供补丁)

19
src/widgets/edit.c
View File

@ -762,7 +762,8 @@ static ret_t edit_on_key_up(widget_t* widget, key_event_t* e) {
edit_on_focused(widget);
} else {
keyboard_type_t keyboard_type = system_info()->keyboard_type;
if (edit->focus_next_when_enter && keyboard_type != KEYBOARD_3KEYS && keyboard_type != KEYBOARD_5KEYS) {
if (edit->focus_next_when_enter && keyboard_type != KEYBOARD_3KEYS &&
keyboard_type != KEYBOARD_5KEYS) {
widget_focus_next(widget);
widget_set_focused(widget, FALSE);
}
@ -983,14 +984,16 @@ ret_t edit_on_event(widget_t* widget, event_t* e) {
if (edit->readonly) {
break;
}
wheel_event_t* evt = (wheel_event_t*)e;
int32_t delta = evt->dy;
if (delta > 0) {
edit_dec(edit);
} else if (delta < 0) {
edit_inc(edit);
if (widget->focused) {
wheel_event_t* evt = (wheel_event_t*)e;
int32_t delta = evt->dy;
if (delta > 0) {
edit_dec(edit);
} else if (delta < 0) {
edit_inc(edit);
}
ret = RET_STOP;
}
ret = RET_STOP;
break;
}
case EVT_RESIZE: