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

fix color picker

Browse Source
This commit is contained in:
xianjimli 2019-04-03 14:45:46 +08:00
parent 4f304a2a03
commit 62c43e5c45
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changes.md
View File

@ -5,7 +5,8 @@
* 修改edit软键盘无法关闭的BUG。
* 修改窗口动画因为取整导致的问题。
* text selector的options属性，指定范围时，支持指定格式。
* 修改window\_base\_load\_theme\_obj从自己的assets\_manager中加载资源。
* 修改window\_base\_load\_theme\_obj从自己的assets\_manager中加载资源(感谢朝泽提供补丁)。
* 修改color picker的BUG(感谢朝泽提供补丁)。
* 2019/04/02
* 软键盘支持tab键。

13
src/ext_widgets/color_picker/color_component.c
View File

@ -35,8 +35,9 @@ static ret_t color_component_update_pressed(widget_t* widget, pointer_event_t* e
color_component_t* color_component = COLOR_COMPONENT(widget);
widget_to_local(widget, &p);
color_component->color_x = p.x;
color_component->color_y = p.y;
color_component->color_x = tk_clampi(p.x, 0, widget->w);
color_component->color_y = tk_clampi(p.y, 0, widget->h);
;
widget_invalidate_force(widget, NULL);
widget_dispatch(widget, &evt);
@ -45,26 +46,28 @@ static ret_t color_component_update_pressed(widget_t* widget, pointer_event_t* e
static ret_t color_component_on_event(widget_t* widget, event_t* e) {
uint16_t type = e->type;
color_component_t* component = COLOR_COMPONENT(widget);
switch (type) {
case EVT_POINTER_DOWN: {
pointer_event_t* evt = (pointer_event_t*)e;
color_component_update_pressed(widget, evt);
widget_grab(widget->parent, widget);
component->pressed = TRUE;
} break;
case EVT_POINTER_MOVE: {
pointer_event_t* evt = (pointer_event_t*)e;
if (evt->pressed) {
if (component->pressed) {
color_component_update_pressed(widget, evt);
}
break;
}
case EVT_POINTER_UP: {
pointer_event_t* evt = (pointer_event_t*)e;
widget_ungrab(widget->parent, widget);
if (evt->pressed) {
if (component->pressed) {
event_t changed = event_init(EVT_VALUE_CHANGED, widget);
widget_dispatch(widget, &changed);
component->pressed = FALSE;
}
break;
}

2
src/ext_widgets/color_picker/color_component.h
View File

@ -49,6 +49,8 @@ typedef struct _color_component_t {
int32_t last_hue;
bool_t need_update;
color_component_update_t update;
bool_t pressed;
} color_component_t;
/**