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 hscroll label

Browse Source
This commit is contained in:
lixianjing 2021-12-14 17:54:34 +08:00
parent 2bf41b2213
commit a46bbf41c5
5 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
design/default/ui/hscroll_label.xml
View File

@ -38,8 +38,10 @@
<hscroll_label <hscroll_label
name="h7_1" name="h7_1"
focusable="true" focusable="true"
loop="true"
yoyo="true"
speed="0.1" speed="0.1"
text="(noloop speed=0.1)为用户提供一个功能强大、高效可靠、简单易用、可轻松做出炫酷效果的 GUI 引擎。" /> text="(always loop yoyo speed=0.1)为用户提供一个功能强大、高效可靠、简单易用、可轻松做出炫酷效果的 GUI 引擎。" />
<hscroll_label <hscroll_label
name="h7_2" name="h7_2"

1
docs/changes.md
View File

@ -2,6 +2,7 @@
2021/12/14 2021/12/14
* 增加工具font\_dump * 增加工具font\_dump
* 修复hscroll\_label控件失去焦点后停止滚动的问题（感谢智明提供补丁）
2021/12/11 2021/12/11
* 增加tk\_str\_is\_in\_array。 * 增加tk\_str\_is\_in\_array。

52
res/assets/default/inc/ui/hscroll_label.data
View File

@ -1,5 +1,5 @@
TK_CONST_DATA_ALIGN(const unsigned char ui_hscroll_label[]) = { TK_CONST_DATA_ALIGN(const unsigned char ui_hscroll_label[]) = {
0x04,0x00,0x01,0x01,0xf0,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x68,0x73,0x63,0x72,0x6f,0x6c,0x6c,0x5f, 0x04,0x00,0x01,0x01,0x0e,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x68,0x73,0x63,0x72,0x6f,0x6c,0x6c,0x5f,
0x6c,0x61,0x62,0x65,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x6c,0x61,0x62,0x65,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x77,0x69,0x6e,0x64,0x6f,0x77,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x77,0x69,0x6e,0x64,0x6f,0x77,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@ -72,34 +72,36 @@ TK_CONST_DATA_ALIGN(const unsigned char ui_hscroll_label[]) = {
0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,
0x00,0x68,0x37,0x5f,0x31,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65, 0x00,0x68,0x37,0x5f,0x31,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,
0x00,0x73,0x70,0x65,0x65,0x64,0x00,0x30,0x2e,0x31,0x00,0x74,0x65,0x78,0x74,0x00,0x28,0x6e,0x6f,0x6c, 0x00,0x6c,0x6f,0x6f,0x70,0x00,0x74,0x72,0x75,0x65,0x00,0x79,0x6f,0x79,0x6f,0x00,0x74,0x72,0x75,0x65,
0x6f,0x6f,0x70,0x20,0x73,0x70,0x65,0x65,0x64,0x3d,0x30,0x2e,0x31,0x29,0xe4,0xb8,0xba,0xe7,0x94,0xa8, 0x00,0x73,0x70,0x65,0x65,0x64,0x00,0x30,0x2e,0x31,0x00,0x74,0x65,0x78,0x74,0x00,0x28,0x61,0x6c,0x77,
0xe6,0x88,0xb7,0xe6,0x8f,0x90,0xe4,0xbe,0x9b,0xe4,0xb8,0x80,0xe4,0xb8,0xaa,0xe5,0x8a,0x9f,0xe8,0x83, 0x61,0x79,0x73,0x20,0x6c,0x6f,0x6f,0x70,0x20,0x79,0x6f,0x79,0x6f,0x20,0x73,0x70,0x65,0x65,0x64,0x3d,
0xbd,0xe5,0xbc,0xba,0xe5,0xa4,0xa7,0xe3,0x80,0x81,0xe9,0xab,0x98,0xe6,0x95,0x88,0xe5,0x8f,0xaf,0xe9, 0x30,0x2e,0x31,0x29,0xe4,0xb8,0xba,0xe7,0x94,0xa8,0xe6,0x88,0xb7,0xe6,0x8f,0x90,0xe4,0xbe,0x9b,0xe4,
0x9d,0xa0,0xe3,0x80,0x81,0xe7,0xae,0x80,0xe5,0x8d,0x95,0xe6,0x98,0x93,0xe7,0x94,0xa8,0xe3,0x80,0x81, 0xb8,0x80,0xe4,0xb8,0xaa,0xe5,0x8a,0x9f,0xe8,0x83,0xbd,0xe5,0xbc,0xba,0xe5,0xa4,0xa7,0xe3,0x80,0x81,
0xe5,0x8f,0xaf,0xe8,0xbd,0xbb,0xe6,0x9d,0xbe,0xe5,0x81,0x9a,0xe5,0x87,0xba,0xe7,0x82,0xab,0xe9,0x85, 0xe9,0xab,0x98,0xe6,0x95,0x88,0xe5,0x8f,0xaf,0xe9,0x9d,0xa0,0xe3,0x80,0x81,0xe7,0xae,0x80,0xe5,0x8d,
0xb7,0xe6,0x95,0x88,0xe6,0x9e,0x9c,0xe7,0x9a,0x84,0x20,0x47,0x55,0x49,0x20,0xe5,0xbc,0x95,0xe6,0x93, 0x95,0xe6,0x98,0x93,0xe7,0x94,0xa8,0xe3,0x80,0x81,0xe5,0x8f,0xaf,0xe8,0xbd,0xbb,0xe6,0x9d,0xbe,0xe5,
0x8e,0xe3,0x80,0x82,0x00,0x00,0x00,0x68,0x73,0x63,0x72,0x6f,0x6c,0x6c,0x5f,0x6c,0x61,0x62,0x65,0x6c, 0x81,0x9a,0xe5,0x87,0xba,0xe7,0x82,0xab,0xe9,0x85,0xb7,0xe6,0x95,0x88,0xe6,0x9e,0x9c,0xe7,0x9a,0x84,
0x20,0x47,0x55,0x49,0x20,0xe5,0xbc,0x95,0xe6,0x93,0x8e,0xe3,0x80,0x82,0x00,0x00,0x00,0x68,0x73,0x63,
0x72,0x6f,0x6c,0x6c,0x5f,0x6c,0x61,0x62,0x65,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00, 0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x68,0x37,0x5f,0x32,0x00,0x66,0x6f,0x63,0x75,0x73,
0x68,0x37,0x5f,0x32,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00, 0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x73,0x70,0x65,0x65,0x64,0x00,0x30,0x2e,0x31,0x00,
0x73,0x70,0x65,0x65,0x64,0x00,0x30,0x2e,0x31,0x00,0x74,0x65,0x78,0x74,0x00,0x28,0x6e,0x6f,0x6c,0x6f, 0x74,0x65,0x78,0x74,0x00,0x28,0x6e,0x6f,0x6c,0x6f,0x6f,0x70,0x20,0x73,0x70,0x65,0x65,0x64,0x3d,0x30,
0x6f,0x70,0x20,0x73,0x70,0x65,0x65,0x64,0x3d,0x30,0x2e,0x31,0x29,0xe4,0xb8,0xba,0xe7,0x94,0xa8,0xe6, 0x2e,0x31,0x29,0xe4,0xb8,0xba,0xe7,0x94,0xa8,0xe6,0x88,0xb7,0xe6,0x8f,0x90,0xe4,0xbe,0x9b,0xe4,0xb8,
0x80,0xe4,0xb8,0xaa,0xe5,0x8a,0x9f,0xe8,0x83,0xbd,0xe5,0xbc,0xba,0xe5,0xa4,0xa7,0xe3,0x80,0x81,0xe9,
0xab,0x98,0xe6,0x95,0x88,0xe5,0x8f,0xaf,0xe9,0x9d,0xa0,0xe3,0x80,0x81,0xe7,0xae,0x80,0xe5,0x8d,0x95,
0xe6,0x98,0x93,0xe7,0x94,0xa8,0xe3,0x80,0x81,0xe5,0x8f,0xaf,0xe8,0xbd,0xbb,0xe6,0x9d,0xbe,0xe5,0x81,
0x9a,0xe5,0x87,0xba,0xe7,0x82,0xab,0xe9,0x85,0xb7,0xe6,0x95,0x88,0xe6,0x9e,0x9c,0xe7,0x9a,0x84,0x20,
0x47,0x55,0x49,0x20,0xe5,0xbc,0x95,0xe6,0x93,0x8e,0xe3,0x80,0x82,0xe4,0xb8,0xba,0xe7,0x94,0xa8,0xe6,
0x88,0xb7,0xe6,0x8f,0x90,0xe4,0xbe,0x9b,0xe4,0xb8,0x80,0xe4,0xb8,0xaa,0xe5,0x8a,0x9f,0xe8,0x83,0xbd, 0x88,0xb7,0xe6,0x8f,0x90,0xe4,0xbe,0x9b,0xe4,0xb8,0x80,0xe4,0xb8,0xaa,0xe5,0x8a,0x9f,0xe8,0x83,0xbd,
0xe5,0xbc,0xba,0xe5,0xa4,0xa7,0xe3,0x80,0x81,0xe9,0xab,0x98,0xe6,0x95,0x88,0xe5,0x8f,0xaf,0xe9,0x9d, 0xe5,0xbc,0xba,0xe5,0xa4,0xa7,0xe3,0x80,0x81,0xe9,0xab,0x98,0xe6,0x95,0x88,0xe5,0x8f,0xaf,0xe9,0x9d,
0xa0,0xe3,0x80,0x81,0xe7,0xae,0x80,0xe5,0x8d,0x95,0xe6,0x98,0x93,0xe7,0x94,0xa8,0xe3,0x80,0x81,0xe5, 0xa0,0xe3,0x80,0x81,0xe7,0xae,0x80,0xe5,0x8d,0x95,0xe6,0x98,0x93,0xe7,0x94,0xa8,0xe3,0x80,0x81,0xe5,
0x8f,0xaf,0xe8,0xbd,0xbb,0xe6,0x9d,0xbe,0xe5,0x81,0x9a,0xe5,0x87,0xba,0xe7,0x82,0xab,0xe9,0x85,0xb7, 0x8f,0xaf,0xe8,0xbd,0xbb,0xe6,0x9d,0xbe,0xe5,0x81,0x9a,0xe5,0x87,0xba,0xe7,0x82,0xab,0xe9,0x85,0xb7,
0xe6,0x95,0x88,0xe6,0x9e,0x9c,0xe7,0x9a,0x84,0x20,0x47,0x55,0x49,0x20,0xe5,0xbc,0x95,0xe6,0x93,0x8e, 0xe6,0x95,0x88,0xe6,0x9e,0x9c,0xe7,0x9a,0x84,0x20,0x47,0x55,0x49,0x20,0xe5,0xbc,0x95,0xe6,0x93,0x8e,
0xe3,0x80,0x82,0xe4,0xb8,0xba,0xe7,0x94,0xa8,0xe6,0x88,0xb7,0xe6,0x8f,0x90,0xe4,0xbe,0x9b,0xe4,0xb8, 0xe3,0x80,0x82,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x80,0xe4,0xb8,0xaa,0xe5,0x8a,0x9f,0xe8,0x83,0xbd,0xe5,0xbc,0xba,0xe5,0xa4,0xa7,0xe3,0x80,0x81,0xe9,
0xab,0x98,0xe6,0x95,0x88,0xe5,0x8f,0xaf,0xe9,0x9d,0xa0,0xe3,0x80,0x81,0xe7,0xae,0x80,0xe5,0x8d,0x95,
0xe6,0x98,0x93,0xe7,0x94,0xa8,0xe3,0x80,0x81,0xe5,0x8f,0xaf,0xe8,0xbd,0xbb,0xe6,0x9d,0xbe,0xe5,0x81,
0x9a,0xe5,0x87,0xba,0xe7,0x82,0xab,0xe9,0x85,0xb7,0xe6,0x95,0x88,0xe6,0x9e,0x9c,0xe7,0x9a,0x84,0x20,
0x47,0x55,0x49,0x20,0xe5,0xbc,0x95,0xe6,0x93,0x8e,0xe3,0x80,0x82,0x00,0x00,0x00,0x62,0x75,0x74,0x74,
0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x6c,0x6f,0x73,0x65,0x00,0x73,0x65,0x6c,0x66,0x5f, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,
0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x28,0x78,0x3d,0x63,0x65,0x6e, 0x6c,0x6f,0x73,0x65,0x00,0x73,0x65,0x6c,0x66,0x5f,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x64,0x65,0x66,
0x74,0x65,0x72,0x2c,0x79,0x3d,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x3a,0x35,0x30,0x2c,0x77,0x3d,0x35,0x30, 0x61,0x75,0x6c,0x74,0x28,0x78,0x3d,0x63,0x65,0x6e,0x74,0x65,0x72,0x2c,0x79,0x3d,0x62,0x6f,0x74,0x74,
0x25,0x2c,0x68,0x3d,0x33,0x30,0x29,0x00,0x66,0x6c,0x6f,0x61,0x74,0x69,0x6e,0x67,0x00,0x74,0x72,0x75, 0x6f,0x6d,0x3a,0x35,0x30,0x2c,0x77,0x3d,0x35,0x30,0x25,0x2c,0x68,0x3d,0x33,0x30,0x29,0x00,0x66,0x6c,
0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x6c,0x6f,0x73,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*2080*/ 0x6f,0x61,0x74,0x69,0x6e,0x67,0x00,0x74,0x72,0x75,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x6c,0x6f,
0x73,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*2110*/

BIN
res/assets/default/raw/ui/hscroll_label.bin
View File

Binary file not shown.

3
src/ext_widgets/scroll_label/hscroll_label.c
View File

@ -435,6 +435,9 @@ static ret_t hscroll_label_on_event(widget_t* widget, event_t* e) {
break; break;
} }
case EVT_BLUR: case EVT_BLUR:
if (!hscroll_label->only_focus) {
break;
}
case EVT_POINTER_DOWN_ABORT: { case EVT_POINTER_DOWN_ABORT: {
if (hscroll_label_is_running(widget)) { if (hscroll_label_is_running(widget)) {
hscroll_label_stop(widget); hscroll_label_stop(widget);