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 switch

Browse Source
This commit is contained in:
xianjimli 2019-07-17 07:01:07 +08:00
parent ae078f6d6c
commit 18be2a289b
24 changed files with 1153 additions and 1045 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/assets/inc/data/a_b_c_any.data
View File

@ -1,4 +1,4 @@
TK_CONST_DATA_ALIGN(const unsigned char data_a_b_c_any[]) = {
0x08,0x00,0x00,0x01,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x2d,0x62,0x2d,0x63,0x2e,0x61,0x6e,
0x08,0x00,0x00,0x01,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x2d,0x62,0x2d,0x63,0x2e,0x61,0x6e,
0x79,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x61,0x62,0x63,0x0d,0x0a,0x00,0x00,0x00,0x00,};/*53*/
0x00,0x00,0x00,0x00,0x61,0x62,0x63,0x0a,0x00,0x00,0x00,0x00,};/*52*/

4
demos/assets/inc/data/com_zlg_app_json.data
View File

@ -1,4 +1,4 @@
TK_CONST_DATA_ALIGN(const unsigned char data_com_zlg_app_json[]) = {
0x08,0x00,0x03,0x01,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x6f,0x6d,0x2e,0x7a,0x6c,0x67,0x2e,
0x08,0x00,0x03,0x01,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x6f,0x6d,0x2e,0x7a,0x6c,0x67,0x2e,
0x61,0x70,0x70,0x2e,0x6a,0x73,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x7b,0x7d,0x0d,0x0a,0x00,0x00,0x00,0x00,};/*52*/
0x00,0x00,0x00,0x00,0x7b,0x7d,0x0a,0x00,0x00,0x00,0x00,};/*51*/

4
demos/assets/inc/data/test_dat.data
View File

@ -1,4 +1,4 @@
TK_CONST_DATA_ALIGN(const unsigned char data_test_dat[]) = {
0x08,0x00,0x04,0x01,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x74,0x65,0x73,0x74,0x2e,0x64,0x61,0x74,
0x08,0x00,0x04,0x01,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x74,0x65,0x73,0x74,0x2e,0x64,0x61,0x74,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x61,0x62,0x63,0x64,0x0d,0x0a,0x00,0x00,0x00,0x00,};/*54*/
0x00,0x00,0x00,0x00,0x61,0x62,0x63,0x64,0x0a,0x00,0x00,0x00,0x00,};/*53*/

6
demos/assets/inc/data/test_json.data
View File

@ -1,5 +1,5 @@
TK_CONST_DATA_ALIGN(const unsigned char data_test_json[]) = {
0x08,0x00,0x03,0x01,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x74,0x65,0x73,0x74,0x2e,0x6a,0x73,0x6f,
0x08,0x00,0x03,0x01,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x74,0x65,0x73,0x74,0x2e,0x6a,0x73,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,0x7b,0x0d,0x0a,0x20,0x20,0x22,0x6e,0x61,0x6d,0x65,0x22,0x3a,0x22,0x66,0x6f,0x72,
0x20,0x74,0x65,0x73,0x74,0x22,0x0d,0x0a,0x7d,0x0d,0x0a,0x00,0x00,0x00,0x00,};/*75*/
0x00,0x00,0x00,0x00,0x7b,0x0a,0x20,0x20,0x22,0x6e,0x61,0x6d,0x65,0x22,0x3a,0x22,0x66,0x6f,0x72,0x20,
0x74,0x65,0x73,0x74,0x22,0x0a,0x7d,0x0a,0x00,0x00,0x00,0x00,};/*72*/

1336
demos/assets/inc/fonts/default.data
View File

File diff suppressed because it is too large Load Diff

4
demos/assets/inc/scripts/dummy.res
View File

@ -1,5 +1,5 @@
TK_CONST_DATA_ALIGN(const unsigned char script_dummy[]) = {
0x07,0x00,0x01,0x01,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x75,0x6d,0x6d,0x79,0x00,0x72,0x65,
0x07,0x00,0x01,0x01,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x75,0x6d,0x6d,0x79,0x00,0x72,0x65,
0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x63,0x6f,0x6e,0x73,0x6f,0x6c,0x65,0x2e,0x6c,0x6f,0x67,0x28,0x22,0x68,0x65,0x6c,
0x6c,0x6f,0x20,0x61,0x77,0x74,0x6b,0x22,0x29,0x3b,0x0d,0x0a,0x00,0x00,0x00,0x00,};/*76*/
0x6c,0x6f,0x20,0x61,0x77,0x74,0x6b,0x22,0x29,0x3b,0x0a,0x00,0x00,0x00,0x00,};/*75*/

14
demos/assets/inc/strings/en_US.data
View File

@ -1,14 +1,14 @@
TK_CONST_DATA_ALIGN(const unsigned char strings_en_US[]) = {
0x06,0x00,0x00,0x01,0xc9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x65,0x6e,0x5f,0x55,0x53,0x00,0x64,0x61,
0x06,0x00,0x00,0x01,0xc4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x65,0x6e,0x5f,0x55,0x53,0x00,0x64,0x61,
0x74,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x3c,0x00,0x00,0x00,0x43,0x00,0x00,0x00,0x4a,0x00,0x00,0x00,
0x52,0x00,0x00,0x00,0x5a,0x00,0x00,0x00,0x62,0x00,0x00,0x00,0x6a,0x00,0x00,0x00,0x7a,0x00,0x00,0x00,
0xab,0x00,0x00,0x00,0xae,0x00,0x00,0x00,0xb1,0x00,0x00,0x00,0xbd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0xa6,0x00,0x00,0x00,0xa9,0x00,0x00,0x00,0xac,0x00,0x00,0x00,0xb8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x63,0x61,0x6e,0x63,0x65,0x6c,0x00,0x43,0x61,0x6e,0x63,0x65,0x6c,0x00,0x63,0x68,
0x69,0x6e,0x65,0x73,0x65,0x00,0x43,0x68,0x69,0x6e,0x65,0x73,0x65,0x00,0x65,0x6e,0x67,0x6c,0x69,0x73,
0x68,0x00,0x45,0x6e,0x67,0x6c,0x69,0x73,0x68,0x00,0x6d,0x75,0x6c,0x74,0x69,0x20,0x6c,0x69,0x6e,0x65,
0x20,0x74,0x65,0x78,0x74,0x00,0x69,0x74,0x0d,0x0a,0x69,0x73,0x0d,0x0a,0x61,0x0d,0x0a,0x6d,0x75,0x6c,
0x74,0x69,0x2d,0x6c,0x69,0x6e,0x65,0x0d,0x0a,0x54,0x72,0x61,0x6e,0x73,0x6c,0x61,0x74,0x65,0x20,0x74,
0x65,0x78,0x74,0x20,0x0d,0x0a,0x28,0x63,0x65,0x6e,0x74,0x65,0x72,0x29,0x00,0x6f,0x6b,0x00,0x4f,0x4b,
0x00,0x76,0x61,0x6c,0x75,0x65,0x20,0x69,0x73,0x20,0x25,0x64,0x00,0x76,0x61,0x6c,0x75,0x65,0x20,0x69,
0x73,0x20,0x25,0x64,0x00,0x00,0x00,0x00,0x00,};/*249*/
0x20,0x74,0x65,0x78,0x74,0x00,0x69,0x74,0x0a,0x69,0x73,0x0a,0x61,0x0a,0x6d,0x75,0x6c,0x74,0x69,0x2d,
0x6c,0x69,0x6e,0x65,0x0a,0x54,0x72,0x61,0x6e,0x73,0x6c,0x61,0x74,0x65,0x20,0x74,0x65,0x78,0x74,0x20,
0x0a,0x28,0x63,0x65,0x6e,0x74,0x65,0x72,0x29,0x00,0x6f,0x6b,0x00,0x4f,0x4b,0x00,0x76,0x61,0x6c,0x75,
0x65,0x20,0x69,0x73,0x20,0x25,0x64,0x00,0x76,0x61,0x6c,0x75,0x65,0x20,0x69,0x73,0x20,0x25,0x64,0x00,
0x00,0x00,0x00,0x00,};/*244*/

2
demos/assets/inc/strings/zh_CN.data
View File

@ -3,7 +3,7 @@ TK_CONST_DATA_ALIGN(const unsigned char strings_zh_CN[]) = {
0x74,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x00,0x34,0x00,0x00,0x00,0x3b,0x00,0x00,0x00,0x42,0x00,0x00,0x00,
0x4a,0x00,0x00,0x00,0x51,0x00,0x00,0x00,0x59,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x63,0x00,0x00,0x00,
0x6a,0x00,0x00,0x00,0x76,0x00,0x00,0x00,0xb1,0x00,0x00,0x00,0xbd,0x00,0x00,0x00,0x63,0x61,0x6e,0x63,
0x6a,0x00,0x00,0x00,0x76,0x00,0x00,0x00,0xac,0x00,0x00,0x00,0xb8,0x00,0x00,0x00,0x63,0x61,0x6e,0x63,
0x65,0x6c,0x00,0xe5,0x8f,0x96,0xe6,0xb6,0x88,0x00,0x63,0x68,0x69,0x6e,0x65,0x73,0x65,0x00,0xe4,0xb8,
0xad,0xe6,0x96,0x87,0x00,0x65,0x6e,0x67,0x6c,0x69,0x73,0x68,0x00,0xe8,0x8b,0xb1,0xe6,0x96,0x87,0x00,
0x6f,0x6b,0x00,0xe7,0xa1,0xae,0xe5,0xae,0x9a,0x00,0x76,0x61,0x6c,0x75,0x65,0x20,0x69,0x73,0x20,0x25,

521
demos/assets/inc/styles/default.data
View File

File diff suppressed because it is too large Load Diff

99
demos/assets/inc/ui/label.data
View File

@ -1,5 +1,5 @@
TK_CONST_DATA_ALIGN(const unsigned char ui_label[]) = {
0x04,0x00,0x01,0x01,0xe9,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x6c,0x61,0x62,0x65,0x6c,0x00,0x64,0x61,
0x04,0x00,0x01,0x01,0xe4,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x6c,0x61,0x62,0x65,0x6c,0x00,0x64,0x61,
0x74,0x61,0x00,0x00,0x00,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@ -8,60 +8,59 @@ TK_CONST_DATA_ALIGN(const unsigned char ui_label[]) = {
0x63,0x3d,0x33,0x2c,0x72,0x3d,0x34,0x29,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,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x74,
0x79,0x6c,0x65,0x00,0x6c,0x65,0x66,0x74,0x00,0x74,0x65,0x78,0x74,0x00,0x69,0x74,0x0d,0x0a,0x69,0x73,
0x0d,0x0a,0x61,0x0d,0x0a,0x6d,0x75,0x6c,0x74,0x69,0x2d,0x6c,0x69,0x6e,0x65,0x0d,0x0a,0x73,0x61,0x6d,
0x70,0x6c,0x65,0x0d,0x0a,0x28,0x6c,0x65,0x66,0x74,0x29,0x00,0x00,0x00,0x6c,0x61,0x62,0x65,0x6c,0x00,
0x79,0x6c,0x65,0x00,0x6c,0x65,0x66,0x74,0x00,0x74,0x65,0x78,0x74,0x00,0x69,0x74,0x0a,0x69,0x73,0x0a,
0x61,0x0a,0x6d,0x75,0x6c,0x74,0x69,0x2d,0x6c,0x69,0x6e,0x65,0x0a,0x73,0x61,0x6d,0x70,0x6c,0x65,0x0a,
0x28,0x6c,0x65,0x66,0x74,0x29,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,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,0x73,0x74,0x79,0x6c,0x65,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,0x00,0x74,0x72,0x5f,0x74,0x65,
0x78,0x74,0x00,0x6d,0x75,0x6c,0x74,0x69,0x20,0x6c,0x69,0x6e,0x65,0x20,0x74,0x65,0x78,0x74,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x72,0x69,0x67,0x68,0x74,
0x00,0x74,0x65,0x78,0x74,0x00,0x69,0x74,0x0a,0x69,0x73,0x0a,0x61,0x0a,0x6d,0x75,0x6c,0x74,0x69,0x2d,
0x6c,0x69,0x6e,0x65,0x0a,0x73,0x61,0x6d,0x70,0x6c,0x65,0x0a,0x28,0x72,0x69,0x67,0x68,0x74,0x29,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x63,0x65,0x6e,0x74,
0x65,0x72,0x5f,0x74,0x6f,0x70,0x00,0x74,0x65,0x78,0x74,0x00,0x69,0x74,0x0a,0x69,0x73,0x0a,0x61,0x0a,
0x6d,0x75,0x6c,0x74,0x69,0x2d,0x6c,0x69,0x6e,0x65,0x0a,0x73,0x61,0x6d,0x70,0x6c,0x65,0x0a,0x28,0x63,
0x65,0x6e,0x74,0x65,0x72,0x5f,0x74,0x6f,0x70,0x29,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,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,0x00,0x74,0x65,0x78,0x74,0x00,0x69,
0x74,0x0a,0x69,0x73,0x0a,0x61,0x0a,0x6d,0x75,0x6c,0x74,0x69,0x2d,0x6c,0x69,0x6e,0x65,0x0a,0x73,0x61,
0x6d,0x70,0x6c,0x65,0x0a,0x28,0x63,0x65,0x6e,0x74,0x65,0x72,0x29,0x00,0x00,0x00,0x6c,0x61,0x62,0x65,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x74,0x79,
0x6c,0x65,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,0x00,0x74,0x72,0x5f,0x74,0x65,0x78,0x74,0x00,0x6d,0x75,
0x6c,0x74,0x69,0x20,0x6c,0x69,0x6e,0x65,0x20,0x74,0x65,0x78,0x74,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,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,0x5f,0x62,0x6f,0x74,
0x74,0x6f,0x6d,0x00,0x74,0x65,0x78,0x74,0x00,0x69,0x74,0x0a,0x69,0x73,0x0a,0x61,0x0a,0x6d,0x75,0x6c,
0x74,0x69,0x2d,0x6c,0x69,0x6e,0x65,0x0a,0x73,0x61,0x6d,0x70,0x6c,0x65,0x0a,0x28,0x63,0x65,0x6e,0x74,
0x65,0x72,0x5f,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x29,0x00,0x00,0x00,0x6c,0x61,0x62,0x65,0x6c,0x00,0x00,
0x00,0x00,0x00,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x72,0x69,0x67,0x68,0x74,0x00,0x74,0x65,0x78,0x74,
0x00,0x69,0x74,0x0a,0x69,0x73,0x0a,0x61,0x0a,0x6d,0x75,0x6c,0x74,0x69,0x2d,0x6c,0x69,0x6e,0x65,0x0a,
0x73,0x61,0x6d,0x70,0x6c,0x65,0x0a,0x28,0x72,0x69,0x67,0x68,0x74,0x29,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,0x5f,0x74,0x6f,
0x70,0x00,0x74,0x65,0x78,0x74,0x00,0x69,0x74,0x0a,0x69,0x73,0x0a,0x61,0x0a,0x6d,0x75,0x6c,0x74,0x69,
0x2d,0x6c,0x69,0x6e,0x65,0x0a,0x73,0x61,0x6d,0x70,0x6c,0x65,0x0a,0x28,0x63,0x65,0x6e,0x74,0x65,0x72,
0x5f,0x74,0x6f,0x70,0x29,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x6c,0x65,0x66,0x74,0x00,0x74,0x65,0x78,0x74,0x00,0x64,0x69,0x61,
0x6c,0x69,0x6e,0x67,0x2e,0x2e,0x2e,0x00,0x61,0x6e,0x69,0x6d,0x61,0x74,0x69,0x6f,0x6e,0x00,0x6c,0x65,
0x6e,0x67,0x74,0x68,0x28,0x66,0x72,0x6f,0x6d,0x3d,0x37,0x2c,0x20,0x74,0x6f,0x3d,0x31,0x32,0x2c,0x20,
0x65,0x61,0x73,0x69,0x6e,0x67,0x3d,0x6c,0x69,0x6e,0x65,0x61,0x72,0x2c,0x20,0x64,0x75,0x72,0x61,0x74,
0x69,0x6f,0x6e,0x3d,0x31,0x32,0x30,0x30,0x2c,0x20,0x72,0x65,0x70,0x65,0x61,0x74,0x3d,0x31,0x30,0x30,
0x30,0x29,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x63,
0x65,0x6e,0x74,0x65,0x72,0x00,0x74,0x65,0x78,0x74,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x72,0x69,0x67,0x68,0x74,0x00,
0x74,0x65,0x78,0x74,0x00,0x72,0x69,0x67,0x68,0x74,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,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,0x5f,0x74,0x6f,0x70,0x00,0x74,0x65,
0x78,0x74,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,0x5f,0x74,0x6f,0x70,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,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,0x00,0x74,0x65,0x78,
0x74,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,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,0x00,0x73,0x74,0x79,0x6c,
0x65,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,0x00,0x74,0x65,0x78,0x74,0x00,0x69,0x74,0x0a,0x69,0x73,0x0a,
0x61,0x0a,0x6d,0x75,0x6c,0x74,0x69,0x2d,0x6c,0x69,0x6e,0x65,0x0a,0x73,0x61,0x6d,0x70,0x6c,0x65,0x0a,
0x28,0x63,0x65,0x6e,0x74,0x65,0x72,0x29,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,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,
0x74,0x79,0x6c,0x65,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,0x5f,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x00,0x74,
0x65,0x78,0x74,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,0x5f,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,};/*1305*/
0x65,0x78,0x74,0x00,0x69,0x74,0x0a,0x69,0x73,0x0a,0x61,0x0a,0x6d,0x75,0x6c,0x74,0x69,0x2d,0x6c,0x69,
0x6e,0x65,0x0a,0x73,0x61,0x6d,0x70,0x6c,0x65,0x0a,0x28,0x63,0x65,0x6e,0x74,0x65,0x72,0x5f,0x62,0x6f,
0x74,0x74,0x6f,0x6d,0x29,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x74,0x79,0x6c,
0x65,0x00,0x6c,0x65,0x66,0x74,0x00,0x74,0x65,0x78,0x74,0x00,0x64,0x69,0x61,0x6c,0x69,0x6e,0x67,0x2e,
0x2e,0x2e,0x00,0x61,0x6e,0x69,0x6d,0x61,0x74,0x69,0x6f,0x6e,0x00,0x6c,0x65,0x6e,0x67,0x74,0x68,0x28,
0x66,0x72,0x6f,0x6d,0x3d,0x37,0x2c,0x20,0x74,0x6f,0x3d,0x31,0x32,0x2c,0x20,0x65,0x61,0x73,0x69,0x6e,
0x67,0x3d,0x6c,0x69,0x6e,0x65,0x61,0x72,0x2c,0x20,0x64,0x75,0x72,0x61,0x74,0x69,0x6f,0x6e,0x3d,0x31,
0x32,0x30,0x30,0x2c,0x20,0x72,0x65,0x70,0x65,0x61,0x74,0x3d,0x31,0x30,0x30,0x30,0x29,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,
0x00,0x74,0x65,0x78,0x74,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,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,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x72,0x69,0x67,0x68,0x74,0x00,0x74,0x65,0x78,0x74,0x00,
0x72,0x69,0x67,0x68,0x74,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x74,0x79,0x6c,
0x65,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,0x5f,0x74,0x6f,0x70,0x00,0x74,0x65,0x78,0x74,0x00,0x63,0x65,
0x6e,0x74,0x65,0x72,0x5f,0x74,0x6f,0x70,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,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,
0x74,0x79,0x6c,0x65,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,0x00,0x74,0x65,0x78,0x74,0x00,0x63,0x65,0x6e,
0x74,0x65,0x72,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,
0x63,0x65,0x6e,0x74,0x65,0x72,0x5f,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x00,0x74,0x65,0x78,0x74,0x00,0x63,
0x65,0x6e,0x74,0x65,0x72,0x5f,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*1300*/

30
demos/assets/inc/ui/rich_text.data
View File

@ -1,5 +1,5 @@
TK_CONST_DATA_ALIGN(const unsigned char ui_rich_text[]) = {
0x04,0x00,0x01,0x01,0xd5,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x72,0x69,0x63,0x68,0x5f,0x74,0x65,0x78,
0x04,0x00,0x01,0x01,0xd3,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x72,0x69,0x63,0x68,0x5f,0x74,0x65,0x78,
0x74,0x00,0x64,0x61,0x74,0x61,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@ -50,17 +50,17 @@ TK_CONST_DATA_ALIGN(const unsigned char ui_rich_text[]) = {
0x73,0x20,0x79,0x6f,0x75,0x20,0x65,0x76,0x65,0x6e,0x74,0x73,0x20,0x66,0x72,0x6f,0x6d,0x20,0x70,0x65,
0x6f,0x70,0x6c,0x65,0x20,0x79,0x6f,0x75,0x20,0x66,0x6f,0x6c,0x6c,0x6f,0x77,0x20,0x61,0x6e,0x64,0x20,
0x72,0x65,0x70,0x6f,0x73,0x69,0x74,0x6f,0x72,0x69,0x65,0x73,0x20,0x79,0x6f,0x75,0x20,0x77,0x61,0x74,
0x63,0x68,0x2e,0x20,0x0d,0x0a,0x20,0x68,0x65,0x6c,0x6c,0x6f,0x20,0x77,0x6f,0x72,0x6c,0x64,0x21,0x0d,
0x0a,0x20,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x63,0x6f,0x6c,0x6f,0x72,
0x3d,0x22,0x72,0x65,0x64,0x22,0x20,0x73,0x69,0x7a,0x65,0x3d,0x22,0x32,0x30,0x22,0x3e,0xe7,0xa1,0xae,
0xe5,0xae,0x9a,0xe5,0x8f,0x96,0xe6,0xb6,0x88,0xe4,0xb8,0xad,0xe6,0x96,0x87,0xe5,0xad,0x97,0xe7,0xac,
0xa6,0xe6,0xb5,0x8b,0xe8,0xaf,0x95,0xe3,0x80,0x82,0xe7,0xa1,0xae,0xe5,0xae,0x9a,0xe3,0x80,0x82,0xe5,
0x8f,0x96,0xe6,0xb6,0x88,0xe3,0x80,0x82,0xe4,0xb8,0xad,0xe6,0x96,0x87,0xe5,0xad,0x97,0xe7,0xac,0xa6,
0xe6,0xb5,0x8b,0xe8,0xaf,0x95,0xe3,0x80,0x82,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x22,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,
0x19,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x73,0x65,0x6c,0x66,0x5f,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,
0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x28,0x78,0x3d,0x63,0x2c,0x79,0x3d,0x62,0x6f,0x74,0x74,0x6f,0x6d,
0x3a,0x31,0x30,0x2c,0x77,0x3d,0x32,0x35,0x25,0x2c,0x68,0x3d,0x34,0x30,0x29,0x00,0x6e,0x61,0x6d,0x65,
0x00,0x63,0x6c,0x6f,0x73,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x6c,0x6f,0x73,0x65,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,};/*1285*/
0x63,0x68,0x2e,0x20,0x0a,0x20,0x68,0x65,0x6c,0x6c,0x6f,0x20,0x77,0x6f,0x72,0x6c,0x64,0x21,0x0a,0x20,
0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3d,0x22,
0x72,0x65,0x64,0x22,0x20,0x73,0x69,0x7a,0x65,0x3d,0x22,0x32,0x30,0x22,0x3e,0xe7,0xa1,0xae,0xe5,0xae,
0x9a,0xe5,0x8f,0x96,0xe6,0xb6,0x88,0xe4,0xb8,0xad,0xe6,0x96,0x87,0xe5,0xad,0x97,0xe7,0xac,0xa6,0xe6,
0xb5,0x8b,0xe8,0xaf,0x95,0xe3,0x80,0x82,0xe7,0xa1,0xae,0xe5,0xae,0x9a,0xe3,0x80,0x82,0xe5,0x8f,0x96,
0xe6,0xb6,0x88,0xe3,0x80,0x82,0xe4,0xb8,0xad,0xe6,0x96,0x87,0xe5,0xad,0x97,0xe7,0xac,0xa6,0xe6,0xb5,
0x8b,0xe8,0xaf,0x95,0xe3,0x80,0x82,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x22,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,0x19,0x00,
0x00,0x00,0x28,0x00,0x00,0x00,0x73,0x65,0x6c,0x66,0x5f,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x64,0x65,
0x66,0x61,0x75,0x6c,0x74,0x28,0x78,0x3d,0x63,0x2c,0x79,0x3d,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x3a,0x31,
0x30,0x2c,0x77,0x3d,0x32,0x35,0x25,0x2c,0x68,0x3d,0x34,0x30,0x29,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,
0x6c,0x6f,0x73,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x6c,0x6f,0x73,0x65,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,};/*1283*/

21
demos/assets/inc/ui/switch.data
View File

@ -1,5 +1,5 @@
TK_CONST_DATA_ALIGN(const unsigned char ui_switch[]) = {
0x04,0x00,0x01,0x01,0x39,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x77,0x69,0x74,0x63,0x68,0x00,0x64,
0x04,0x00,0x01,0x01,0x78,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x77,0x69,0x74,0x63,0x68,0x00,0x64,
0x61,0x74,0x61,0x00,0x00,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@ -9,12 +9,15 @@ TK_CONST_DATA_ALIGN(const unsigned char ui_switch[]) = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x3c,0x00,
0x00,0x00,0x16,0x00,0x00,0x00,0x00,0x00,0x73,0x77,0x69,0x74,0x63,0x68,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,
0xc8,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x72,0x6f,0x75,0x6e,
0x64,0x5f,0x72,0x61,0x64,0x69,0x75,0x73,0x00,0x31,0x30,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,
0xc8,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x73,0x74,0x79,0x6c,
0x65,0x00,0x72,0x6f,0x75,0x6e,0x64,0x65,0x64,0x00,0x00,0x00,0x73,0x77,0x69,0x74,0x63,0x68,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,0x32,0x00,0x00,0x00,0x1e,0x00,
0x00,0x00,0x73,0x65,0x6c,0x66,0x5f,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,
0x74,0x28,0x78,0x3d,0x63,0x65,0x6e,0x74,0x65,0x72,0x2c,0x79,0x3d,0x6d,0x69,0x64,0x64,0x6c,0x65,0x2c,
0x77,0x3d,0x35,0x30,0x25,0x2c,0x68,0x3d,0x33,0x30,0x29,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x6c,0x6f,
0x73,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x63,0x6c,0x6f,0x73,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,};/*361*/
0x00,0x00,0x00,0x00,0x14,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x2c,0x00,0x00,0x00,0x16,0x00,0x00,0x00,
0x73,0x74,0x79,0x6c,0x65,0x00,0x6e,0x6f,0x5f,0x69,0x6d,0x61,0x67,0x65,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,0x32,0x00,0x00,
0x00,0x1e,0x00,0x00,0x00,0x73,0x65,0x6c,0x66,0x5f,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x64,0x65,0x66,
0x61,0x75,0x6c,0x74,0x28,0x78,0x3d,0x63,0x65,0x6e,0x74,0x65,0x72,0x2c,0x79,0x3d,0x6d,0x69,0x64,0x64,
0x6c,0x65,0x2c,0x77,0x3d,0x35,0x30,0x25,0x2c,0x68,0x3d,0x33,0x30,0x29,0x00,0x6e,0x61,0x6d,0x65,0x00,
0x63,0x6c,0x6f,0x73,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x63,0x6c,0x6f,0x73,0x65,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,};/*424*/

14
demos/assets/inc/xml/test.data
View File

@ -1,10 +1,10 @@
TK_CONST_DATA_ALIGN(const unsigned char xml_test[]) = {
0x05,0x00,0x00,0x01,0x7b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x74,0x65,0x73,0x74,0x00,0x64,0x61,0x74,
0x05,0x00,0x00,0x01,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x74,0x65,0x73,0x74,0x00,0x64,0x61,0x74,
0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x3c,0x77,0x69,0x6e,0x64,0x6f,0x77,0x20,0x61,0x6e,0x69,0x6d,0x5f,0x68,0x69,0x6e,
0x74,0x3d,0x22,0x68,0x74,0x72,0x61,0x6e,0x73,0x6c,0x61,0x74,0x65,0x22,0x3e,0x0d,0x0a,0x20,0x20,0x3c,
0x62,0x75,0x74,0x74,0x6f,0x6e,0x20,0x6e,0x61,0x6d,0x65,0x3d,0x22,0x63,0x6c,0x6f,0x73,0x65,0x22,0x20,
0x78,0x3d,0x22,0x63,0x65,0x6e,0x74,0x65,0x72,0x22,0x20,0x79,0x3d,0x22,0x62,0x6f,0x74,0x74,0x6f,0x6d,
0x3a,0x31,0x30,0x22,0x20,0x77,0x3d,0x22,0x32,0x35,0x25,0x22,0x20,0x68,0x3d,0x22,0x33,0x30,0x22,0x20,
0x74,0x65,0x78,0x74,0x3d,0x22,0x43,0x6c,0x6f,0x73,0x65,0x22,0x2f,0x3e,0x0d,0x0a,0x3c,0x2f,0x77,0x69,
0x6e,0x64,0x6f,0x77,0x3e,0x0d,0x0a,0x00,0x00,0x00,0x00,};/*171*/
0x74,0x3d,0x22,0x68,0x74,0x72,0x61,0x6e,0x73,0x6c,0x61,0x74,0x65,0x22,0x3e,0x0a,0x20,0x20,0x3c,0x62,
0x75,0x74,0x74,0x6f,0x6e,0x20,0x6e,0x61,0x6d,0x65,0x3d,0x22,0x63,0x6c,0x6f,0x73,0x65,0x22,0x20,0x78,
0x3d,0x22,0x63,0x65,0x6e,0x74,0x65,0x72,0x22,0x20,0x79,0x3d,0x22,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x3a,
0x31,0x30,0x22,0x20,0x77,0x3d,0x22,0x32,0x35,0x25,0x22,0x20,0x68,0x3d,0x22,0x33,0x30,0x22,0x20,0x74,
0x65,0x78,0x74,0x3d,0x22,0x43,0x6c,0x6f,0x73,0x65,0x22,0x2f,0x3e,0x0a,0x3c,0x2f,0x77,0x69,0x6e,0x64,
0x6f,0x77,0x3e,0x0a,0x00,0x00,0x00,0x00,};/*168*/

BIN
demos/assets/raw/strings/en_US.bin
View File

Binary file not shown.

BIN
demos/assets/raw/strings/zh_CN.bin
View File

Binary file not shown.

BIN
demos/assets/raw/styles/default.bin
View File

Binary file not shown.

6
demos/assets/raw/styles/default.xml
View File

@ -485,6 +485,12 @@
<style name="default">
<normal bg_image="switch" />
</style>
<style name="rounded">
<normal bg_image="switch" round_radius="11"/>
</style>
<style name="no_image">
<normal bg_color="#828282" selected_bg_color="#338fff" fg_color="#ffffff" round_radius="11"/>
</style>
</switch>
<slide_indicator>

BIN
demos/assets/raw/ui/switch.bin
View File

Binary file not shown.

3
demos/assets/raw/ui/switch.xml
View File

@ -1,6 +1,7 @@
<window anim_hint="htranslate">
<switch x="10" y="60" w="60" h="22" />
<switch x="200" y="60" w="60" h="22" round_radius="10" />
<switch x="200" y="60" w="60" h="22" style="rounded"/>
<switch x="20" y="120" w="44" h="22" style="no_image"/>
<button name="close" x="center" y="middle" w="50%" h="30" text="close"/>
</window>

4
demos/demo_ui_app.c
View File

@ -23,7 +23,7 @@
#include "ext_widgets.h"
static ret_t on_clone_tab(void* ctx, event_t* e);
static ret_t widget_clone_tab(widget_t* widget) ;
static ret_t widget_clone_tab(widget_t* widget);
static void install_click_hander(widget_t* widget);
uint32_t tk_mem_speed_test(void* buffer, uint32_t length, uint32_t* pmemcpy_speed,
@ -92,7 +92,7 @@ static void open_window(const char* name, widget_t* to_close) {
install_click_hander(win);
if(tk_str_eq(name, "tab_scrollable")) {
if (tk_str_eq(name, "tab_scrollable")) {
widget_clone_tab(win);
widget_clone_tab(win);
widget_clone_tab(win);

2
docs/changes.md
View File

@ -1,4 +1,6 @@
# 最新动态
* 2019/07/17
* 完善switch控件(感谢朝泽提供补丁)
* 2019/07/15
* 完善agge后端(感谢智明提供补丁)

111
src/ext_widgets/switch/switch.c
View File

@ -74,6 +74,7 @@ static ret_t switch_scroll_to(widget_t* widget, int32_t xoffset_end) {
xoffset = aswitch->xoffset;
if (xoffset == xoffset_end) {
switch_set_value(widget, aswitch->xoffset == 0);
return RET_OK;
}
@ -162,6 +163,44 @@ static ret_t switch_on_event(widget_t* widget, event_t* e) {
return RET_OK;
}
ret_t switch_fill_rect_color(widget_t* widget, canvas_t* c, rect_t* r, bool_t bg) {
style_t* style = widget->astyle;
switch_t* aswitch = SWITCH(widget);
color_t trans = color_init(0, 0, 0, 0);
uint32_t radius = style_get_int(style, STYLE_ID_ROUND_RADIUS, 0);
const char* color_key = bg ? (aswitch->value ? STYLE_ID_SELECTED_BG_COLOR : STYLE_ID_BG_COLOR)
: (aswitch->value ? STYLE_ID_SELECTED_FG_COLOR : STYLE_ID_FG_COLOR);
color_t color = style_get_color(style, color_key, trans);
if (color.rgba.a == 0 && aswitch->value) {
color_key = bg ? STYLE_ID_BG_COLOR : STYLE_ID_FG_COLOR;
color = style_get_color(style, color_key, trans);
}
if (color.rgba.a && r->w > 0 && r->h > 0) {
canvas_set_fill_color(c, color);
if (radius > 3) {
vgcanvas_t* vg = canvas_get_vgcanvas(c);
if (vg != NULL) {
xy_t x = r->x + 0.5;
xy_t y = r->y + 0.5;
vgcanvas_set_fill_color(vg, color);
vgcanvas_translate(vg, c->ox, c->oy);
vgcanvas_rounded_rect(vg, x, y, r->w, r->h, radius);
vgcanvas_translate(vg, -c->ox, -c->oy);
vgcanvas_fill(vg);
} else {
canvas_fill_rect(c, r->x, r->y, r->w, r->h);
}
} else {
canvas_fill_rect(c, r->x, r->y, r->w, r->h);
}
}
return RET_OK;
}
static ret_t switch_on_paint_background_img(widget_t* widget, canvas_t* c, bitmap_t* img) {
int32_t w = 0;
int32_t h = 0;
@ -181,7 +220,7 @@ static ret_t switch_on_paint_background_img(widget_t* widget, canvas_t* c, bitma
wscale = (float_t)(widget->w) / (float_t)iw;
hscale = (float_t)(widget->h) / (float_t)ih;
xoffset = (float_t)(aswitch->xoffset) / wscale;
round_radius = aswitch->round_radius / hscale;
round_radius = style_get_int(widget->astyle, STYLE_ID_ROUND_RADIUS, 0) / hscale;
h = ih;
w = iw * (1 - aswitch->max_xoffset_ratio);
@ -215,21 +254,76 @@ static ret_t switch_on_paint_background_img(widget_t* widget, canvas_t* c, bitma
static ret_t switch_on_paint_background(widget_t* widget, canvas_t* c) {
style_t* style = NULL;
const char* image_name = NULL;
return_value_if_fail(widget != NULL && widget->astyle != NULL, RET_BAD_PARAMS);
switch_t* aswitch = SWITCH(widget);
return_value_if_fail(aswitch != NULL && widget->astyle != NULL, RET_BAD_PARAMS);
style = widget->astyle;
image_name = style_get_str(style, STYLE_ID_BG_IMAGE, "switch");
image_name = style_get_str(style, STYLE_ID_BG_IMAGE, NULL);
if (image_name != NULL) {
bitmap_t img;
if (widget_load_image(widget, image_name, &img) == RET_OK) {
return switch_on_paint_background_img(widget, c, &img);
}
} else {
int32_t w = tk_roundi(widget->w * 1.5 * (1 - aswitch->max_xoffset_ratio));
rect_t r = rect_init((widget->w - w) / 2.0f, 0, w, widget->h);
return switch_fill_rect_color(widget, c, &r, TRUE);
}
return RET_FAIL;
}
static ret_t switch_on_paint_self(widget_t* widget, canvas_t* c) {
float_t xoffset, xoffset_ratio;
int32_t max_xoffset;
int32_t bar_size;
int32_t w;
rect_t r = rect_init(0, 0, 0, 0);
int32_t margin = 0;
int32_t margin_left = 0;
int32_t margin_right = 0;
int32_t margin_top = 0;
int32_t margin_bottom = 0;
style_t* style = NULL;
const char* image_name = NULL;
const char* image_key = NULL;
switch_t* aswitch = SWITCH(widget);
return_value_if_fail(aswitch != NULL && widget->astyle != NULL, RET_BAD_PARAMS);
style = widget->astyle;
image_key = STYLE_ID_FG_IMAGE;
image_name = style_get_str(style, image_key, NULL);
margin = style_get_int(style, STYLE_ID_MARGIN, 0);
margin_top = style_get_int(style, STYLE_ID_MARGIN_TOP, margin);
margin_left = style_get_int(style, STYLE_ID_MARGIN_LEFT, margin);
margin_right = style_get_int(style, STYLE_ID_MARGIN_RIGHT, margin);
margin_bottom = style_get_int(style, STYLE_ID_MARGIN_BOTTOM, margin);
w = tk_roundi(widget->w * 1.5 * (1 - aswitch->max_xoffset_ratio));
bar_size = tk_roundi(w / 2);
max_xoffset = aswitch->max_xoffset_ratio * widget->w;
xoffset_ratio = (float_t)(w - bar_size) / max_xoffset;
xoffset = (float_t)(aswitch->xoffset) * xoffset_ratio;
r.x = widget->w / 2.0 - xoffset + margin_left;
r.y = margin_top;
r.w = bar_size - margin_left - margin_right;
r.h = widget->h - margin_top - margin_bottom;
if (image_name == NULL) {
switch_fill_rect_color(widget, c, &r, FALSE);
} else {
bitmap_t img;
if (widget_load_image(widget, image_name, &img) == RET_OK) {
image_draw_type_t draw_type =
(image_draw_type_t)style_get_int(style, STYLE_ID_FG_IMAGE_DRAW_TYPE, IMAGE_DRAW_CENTER);
canvas_draw_image_ex(c, &img, draw_type, &r);
}
}
return RET_OK;
}
ret_t switch_set_value(widget_t* widget, bool_t value) {
switch_t* aswitch = SWITCH(widget);
return_value_if_fail(aswitch != NULL, RET_BAD_PARAMS);
@ -266,9 +360,6 @@ static ret_t switch_get_prop(widget_t* widget, const char* name, value_t* v) {
} else if (tk_str_eq(name, WIDGET_PROP_XOFFSET)) {
value_set_int(v, aswitch->xoffset);
return RET_OK;
} else if (tk_str_eq(name, SWITCH_PROP_ROUND_RADIUS)) {
value_set_int(v, aswitch->round_radius);
return RET_OK;
} else if (tk_str_eq(name, SWITCH_PROP_MAX_XOFFSET_RATIO)) {
value_set_float(v, aswitch->max_xoffset_ratio);
return RET_OK;
@ -288,9 +379,6 @@ static ret_t switch_set_prop(widget_t* widget, const char* name, const value_t*
return RET_OK;
} else if (tk_str_eq(name, WIDGET_PROP_YOFFSET)) {
return RET_OK;
} else if (tk_str_eq(name, SWITCH_PROP_ROUND_RADIUS)) {
aswitch->round_radius = value_int(v);
return RET_OK;
} else if (tk_str_eq(name, SWITCH_PROP_MAX_XOFFSET_RATIO)) {
aswitch->max_xoffset_ratio = value_float(v);
return RET_OK;
@ -300,8 +388,7 @@ static ret_t switch_set_prop(widget_t* widget, const char* name, const value_t*
}
static const char* s_switch_properties[] = {WIDGET_PROP_VALUE, WIDGET_PROP_XOFFSET,
SWITCH_PROP_ROUND_RADIUS, SWITCH_PROP_MAX_XOFFSET_RATIO,
NULL};
SWITCH_PROP_MAX_XOFFSET_RATIO, NULL};
TK_DECL_VTABLE(switch) = {
.inputable = TRUE,
@ -313,6 +400,7 @@ TK_DECL_VTABLE(switch) = {
.create = switch_create,
.on_event = switch_on_event,
.on_paint_background = switch_on_paint_background,
.on_paint_self = switch_on_paint_self,
.get_prop = switch_get_prop,
.set_prop = switch_set_prop,
};
@ -323,7 +411,6 @@ widget_t* switch_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h) {
return_value_if_fail(aswitch != NULL, NULL);
aswitch->value = TRUE;
aswitch->round_radius = 0;
aswitch->max_xoffset_ratio = 0.34f;
return widget;

8
src/ext_widgets/switch/switch.h
View File

@ -83,13 +83,6 @@ typedef struct _switch_t {
*/
float_t max_xoffset_ratio;
/**
* @property {int32_t} round_radius
* @annotation ["set_prop","get_prop","readable","persitent","design","scriptable"]
* 图片的圆角半径。
*/
int32_t round_radius;
/*private*/
int32_t xdown;
int32_t xoffset;
@ -144,7 +137,6 @@ ret_t switch_set_value(widget_t* widget, bool_t value);
*/
widget_t* switch_cast(widget_t* widget);
#define SWITCH_PROP_ROUND_RADIUS "round_radius"
#define SWITCH_PROP_MAX_XOFFSET_RATIO "max_xoffset_ratio"
#define WIDGET_TYPE_SWITCH "switch"

5
tests/switch_test.cc
View File

@ -22,11 +22,6 @@ TEST(Switch, basic) {
ASSERT_EQ(widget_get_prop(w, WIDGET_PROP_VALUE, &v2), RET_OK);
ASSERT_EQ(value_bool(&v1), value_bool(&v2));
value_set_int(&v1, 10);
ASSERT_EQ(widget_set_prop(w, SWITCH_PROP_ROUND_RADIUS, &v1), RET_OK);
ASSERT_EQ(widget_get_prop(w, SWITCH_PROP_ROUND_RADIUS, &v2), RET_OK);
ASSERT_EQ(value_int(&v1), value_int(&v2));
value_set_float(&v1, 0.4);
ASSERT_EQ(widget_set_prop(w, SWITCH_PROP_MAX_XOFFSET_RATIO, &v1), RET_OK);
ASSERT_EQ(widget_get_prop(w, SWITCH_PROP_MAX_XOFFSET_RATIO, &v2), RET_OK);