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 slide view

Browse Source
This commit is contained in:
lixianjing 2023-02-22 17:45:26 +08:00
parent e359a6afa9
commit 2589b1b357
3 changed files with 27 additions and 6 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 @@
# 最新动态
2023/02/22
* slider_view控件把最后一个要修改的值缓存起来，动画播完后切换到该值(感谢雨欣提供补丁)
2023/02/21
* 修复API注释错误(感谢俊圣提供补丁)
* 修改path\_normalize对末尾为点的处理问题(感谢俊圣提供补丁)

28
src/ext_widgets/slide_view/slide_view.c
View File

@ -152,23 +152,32 @@ static ret_t slide_view_on_pointer_down(slide_view_t* slide_view, pointer_event_
}
static ret_t slide_view_on_scroll_done(void* ctx, event_t* e) {
uint32_t active;
widget_t* widget = WIDGET(ctx);
slide_view_t* slide_view = SLIDE_VIEW(ctx);
return_value_if_fail(widget != NULL && slide_view != NULL, RET_BAD_PARAMS);
if (slide_view->xoffset < 0 || slide_view->yoffset < 0) {
active = widget_index_of(slide_view->prev);
if (slide_view->check_last) {
active = active == slide_view->last_active ? active : slide_view->last_active;
}
if (slide_view->remove_when_anim_done) {
widget_destroy(slide_view->next);
slide_view_set_active_no_animate_impl(widget, widget_index_of(slide_view->prev), TRUE);
slide_view_set_active_no_animate_impl(widget, active, TRUE);
} else {
slide_view_set_active_no_animate(widget, widget_index_of(slide_view->prev));
slide_view_set_active_no_animate(widget, active);
}
} else if (slide_view->xoffset > 0 || slide_view->yoffset > 0) {
active = widget_index_of(slide_view->next);
if (slide_view->check_last) {
active = active == slide_view->last_active ? active : slide_view->last_active;
}
if (slide_view->remove_when_anim_done) {
widget_destroy(slide_view->prev);
slide_view_set_active_no_animate_impl(widget, widget_index_of(slide_view->next), TRUE);
slide_view_set_active_no_animate_impl(widget, active, TRUE);
} else {
slide_view_set_active_no_animate(widget, widget_index_of(slide_view->next));
slide_view_set_active_no_animate(widget, active);
}
}
@ -299,6 +308,7 @@ static ret_t slide_view_on_event(widget_t* widget, event_t* e) {
case EVT_POINTER_UP: {
if (slide_view->pressed) {
if (slide_view->dragged) {
slide_view->check_last = FALSE;
slide_view_on_pointer_up(slide_view, (pointer_event_t*)e);
}
slide_view->dragged = FALSE;
@ -903,6 +913,7 @@ static ret_t slide_view_set_active_no_animate_impl(widget_t* widget, uint32_t ac
if (widget_dispatch(widget, (event_t*)&evt) != RET_STOP) {
slide_view->active = active;
slide_view->last_active = slide_view->active;
evt.e.type = EVT_VALUE_CHANGED;
widget_dispatch(widget, (event_t*)&evt);
widget_dispatch_simple_event(widget, EVT_PAGE_CHANGED);
@ -912,6 +923,7 @@ static ret_t slide_view_set_active_no_animate_impl(widget_t* widget, uint32_t ac
slide_view_restore_target(widget);
} else {
slide_view->active = active;
slide_view->last_active = slide_view->active;
}
return RET_OK;
@ -928,8 +940,11 @@ static ret_t slide_view_set_active_animate(widget_t* widget, uint32_t active) {
slide_view_t* slide_view = SLIDE_VIEW(widget);
return_value_if_fail(slide_view != NULL, RET_BAD_PARAMS);
if (slide_view->animating) {
log_warn("slide_view is animating, so slide_view is busy!\r\n");
return RET_BUSY;
log_debug("slide_view is animating, so slide_view is busy!\r\n");
log_debug("When the animation is played, the last active takes effect!\r\n");
slide_view->check_last = TRUE;
slide_view->last_active = active;
return RET_OK;
}
old_active = slide_view->active;
@ -1021,6 +1036,7 @@ widget_t* slide_view_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h) {
slide_view->vertical = FALSE;
slide_view->drag_threshold = TK_DRAG_THRESHOLD;
slide_view->animating_time = TK_ANIMATING_TIME;
slide_view->check_last = FALSE;
str_init(&(slide_view->str_target), DEFAULT_FOCUSED_CHILD_SAVE_TARGET_TAG_LENGT);
slide_view->init_idle_id = idle_add(slide_view_on_idle_init_save_target, widget);

2
src/ext_widgets/slide_view/slide_view.h
View File

@ -133,10 +133,12 @@ typedef struct _slide_view_t {
int32_t xoffset;
int32_t yoffset;
uint32_t active;
uint32_t last_active;
uint32_t timer_id;
bool_t dragged;
bool_t pressed;
bool_t animating;
bool_t check_last;
bool_t remove_when_anim_done;
/* for save focused child */