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

fix slide indicator

Browse Source
This commit is contained in:
lixianjing 2021-03-03 11:01:31 +08:00
parent 4de0c5bff2
commit c9cc5ee5ac
2 changed files with 10 additions and 2 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 @@
# 最新动态
2020/03/03
* 修复slide indicator没有更新的问题（感谢智明提供补丁）
2020/03/02
* 删除将QT XML生成AWTK UI的转换工具（感谢陈谭提供补丁）。
* 修复widget\_clone处理tr\_text的BUG(感谢网友Eagle提供补丁)。

9
src/ext_widgets/slide_view/slide_indicator.c
View File

@ -38,6 +38,7 @@
static ret_t slide_indicator_reset_indicated_widget(widget_t* widget);
static ret_t slide_indicator_reset_indicated_widget(widget_t* widget);
static ret_t slide_indicator_set_indicated_widget(widget_t* widget, widget_t* target);
static ret_t slide_indicator_set_value_impl(widget_t* widget, uint32_t value, bool_t is_on_event);
#define _RADIAN(cx, cy, x, y) atan2(-y + (cy), x - (cx))
#define _DISTANCE(x1, y1, x2, y2) sqrt((x1 - (x2)) * (x1 - (x2)) + (y1 - (y2)) * (y1 - (y2)))
@ -491,7 +492,7 @@ static ret_t slide_indicator_target_on_value_changed(void* ctx, event_t* e) {
}
if (slide_indicator->value != value_int(&v)) {
slide_indicator_set_value(indicator, value_int(&v));
slide_indicator_set_value_impl(indicator, value_int(&v), TRUE);
}
if (widget_get_prop(widget, WIDGET_PROP_PAGE_MAX_NUMBER, &v) != RET_OK) {
@ -793,6 +794,10 @@ widget_t* slide_indicator_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t
}
ret_t slide_indicator_set_value(widget_t* widget, uint32_t value) {
return slide_indicator_set_value_impl(widget, value, FALSE);
}
static ret_t slide_indicator_set_value_impl(widget_t* widget, uint32_t value, bool_t is_on_event) {
slide_indicator_t* slide_indicator = SLIDE_INDICATOR(widget);
return_value_if_fail(slide_indicator != NULL, RET_BAD_PARAMS);
@ -805,7 +810,7 @@ ret_t slide_indicator_set_value(widget_t* widget, uint32_t value) {
value_set_uint32(&(evt.new_value), value);
if (widget_dispatch(widget, (event_t*)&evt) != RET_STOP) {
if (slide_indicator->indicated_widget != NULL) {
if (slide_indicator->indicated_widget != NULL && !is_on_event) {
if (widget_get_prop(slide_indicator->indicated_widget, WIDGET_PROP_CURR_PAGE, &v) !=
RET_OK) {
widget_get_prop(slide_indicator->indicated_widget, WIDGET_PROP_VALUE, &v);