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

improve set theme

Browse Source
This commit is contained in:
lixianjing 2019-10-18 22:05:39 +08:00
parent 79d8bb2ea8
commit 9c68f81719
31 changed files with 1506 additions and 1422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1230
demos/assets.c
View File

File diff suppressed because it is too large Load Diff

BIN
demos/assets/dark/raw/styles/system_bar.bin Normal file
View File

Binary file not shown.

26
demos/assets/dark/raw/styles/system_bar.xml Normal file
View File

@ -0,0 +1,26 @@
<system_bar>
<style name="default">
<normal bg_color="#202020"/>
</style>
</system_bar>
<label>
<style name="title" text_align_h="left">
<normal text_color="white" />
</style>
</label>
<digit_clock>
<style name="time">
<normal text_color="white" />
</style>
</digit_clock>
<button>
<style name="close" icon="earth">
<normal icon="close_n"/>
<pressed icon="close_p"/>
<over icon="close_n"/>
<disable icon="close_d"/>
</style>
</button>

4
demos/assets/default/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,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x2d,0x62,0x2d,0x63,0x2e,0x61,0x6e,
0x08,0x00,0x00,0x01,0x05,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,0x0a,0x00,0x00,0x00,0x00,};/*52*/
0x00,0x00,0x00,0x00,0x61,0x62,0x63,0x0d,0x0a,0x00,0x00,0x00,0x00,};/*53*/

4
demos/assets/default/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,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x6f,0x6d,0x2e,0x7a,0x6c,0x67,0x2e,
0x08,0x00,0x03,0x01,0x04,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,0x0a,0x00,0x00,0x00,0x00,};/*51*/
0x00,0x00,0x00,0x00,0x7b,0x7d,0x0d,0x0a,0x00,0x00,0x00,0x00,};/*52*/

4
demos/assets/default/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,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x74,0x65,0x73,0x74,0x2e,0x64,0x61,0x74,
0x08,0x00,0x04,0x01,0x06,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,0x0a,0x00,0x00,0x00,0x00,};/*53*/
0x00,0x00,0x00,0x00,0x61,0x62,0x63,0x64,0x0d,0x0a,0x00,0x00,0x00,0x00,};/*54*/

6
demos/assets/default/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,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x74,0x65,0x73,0x74,0x2e,0x6a,0x73,0x6f,
0x08,0x00,0x03,0x01,0x1b,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,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*/
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*/

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

File diff suppressed because it is too large Load Diff

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

@ -1,5 +1,5 @@
TK_CONST_DATA_ALIGN(const unsigned char script_dummy[]) = {
0x07,0x00,0x01,0x01,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x75,0x6d,0x6d,0x79,0x00,0x72,0x65,
0x07,0x00,0x01,0x01,0x1c,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,0x0a,0x00,0x00,0x00,0x00,};/*75*/
0x6c,0x6f,0x20,0x61,0x77,0x74,0x6b,0x22,0x29,0x3b,0x0d,0x0a,0x00,0x00,0x00,0x00,};/*76*/

14
demos/assets/default/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,0xc4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x65,0x6e,0x5f,0x55,0x53,0x00,0x64,0x61,
0x06,0x00,0x00,0x01,0xc9,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,
0xa6,0x00,0x00,0x00,0xa9,0x00,0x00,0x00,0xac,0x00,0x00,0x00,0xb8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0xab,0x00,0x00,0x00,0xae,0x00,0x00,0x00,0xb1,0x00,0x00,0x00,0xbd,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,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*/
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*/

2
demos/assets/default/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,0xac,0x00,0x00,0x00,0xb8,0x00,0x00,0x00,0x63,0x61,0x6e,0x63,
0x6a,0x00,0x00,0x00,0x76,0x00,0x00,0x00,0xb1,0x00,0x00,0x00,0xbd,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,

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

@ -1,5 +1,5 @@
TK_CONST_DATA_ALIGN(const unsigned char ui_label[]) = {
0x04,0x00,0x01,0x01,0xe4,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x6c,0x61,0x62,0x65,0x6c,0x00,0x64,0x61,
0x04,0x00,0x01,0x01,0xe9,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,59 +8,60 @@ 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,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,
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,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,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,
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,
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,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,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,0x6c,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,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*/
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*/

21
demos/assets/default/inc/ui/main.data
View File

@ -1,5 +1,5 @@
TK_CONST_DATA_ALIGN(const unsigned char ui_main[]) = {
0x04,0x00,0x01,0x01,0xff,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0x61,0x69,0x6e,0x00,0x64,0x61,0x74,
0x04,0x00,0x01,0x01,0x04,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0x61,0x69,0x6e,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,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,
@ -209,13 +209,14 @@ TK_CONST_DATA_ALIGN(const unsigned char ui_main[]) = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,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,0x72,0x65,0x6c,0x6f,0x61,0x64,0x5f,0x74,0x68,0x65,0x6d,0x65,0x00,
0x74,0x65,0x78,0x74,0x00,0x52,0x65,0x6c,0x6f,0x61,0x64,0x20,0x54,0x68,0x65,0x6d,0x65,0x00,0x00,0x00,
0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x74,0x65,0x78,0x74,0x00,0x54,0x65,0x73,0x74,0x20,0x43,0x68,0x61,0x6e,0x67,0x65,0x20,0x54,0x68,0x65,
0x6d,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,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x65,0x78,0x69,0x74,0x00,0x74,0x65,
0x78,0x74,0x00,0x45,0x78,0x69,0x74,0x00,0x00,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x5f,0x69,0x6e,
0x64,0x69,0x63,0x61,0x74,0x6f,0x72,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x14,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,0x30,0x2c,0x79,0x3d,0x62,0x2c,0x77,0x3d,0x31,0x30,0x30,0x25,0x2c,0x68,0x3d,0x32,0x30,0x29,
0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x62,0x6c,0x75,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*4399*/
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x65,0x78,
0x69,0x74,0x00,0x74,0x65,0x78,0x74,0x00,0x45,0x78,0x69,0x74,0x00,0x00,0x00,0x00,0x00,0x73,0x6c,0x69,
0x64,0x65,0x5f,0x69,0x6e,0x64,0x69,0x63,0x61,0x74,0x6f,0x72,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x00,0x00,
0x00,0x14,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,0x30,0x2c,0x79,0x3d,0x62,0x2c,0x77,0x3d,0x31,0x30,0x30,0x25,0x2c,
0x68,0x3d,0x32,0x30,0x29,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x62,0x6c,0x75,0x65,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,};/*4404*/

30
demos/assets/default/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,0xd3,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x72,0x69,0x63,0x68,0x5f,0x74,0x65,0x78,
0x04,0x00,0x01,0x01,0xd5,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,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*/
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*/

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

@ -1,10 +1,10 @@
TK_CONST_DATA_ALIGN(const unsigned char xml_test[]) = {
0x05,0x00,0x00,0x01,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x74,0x65,0x73,0x74,0x00,0x64,0x61,0x74,
0x05,0x00,0x00,0x01,0x7b,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,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*/
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*/

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

Binary file not shown.

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

Binary file not shown.

BIN
demos/assets/default/raw/ui/label.bin
View File

Binary file not shown.

BIN
demos/assets/default/raw/ui/main.bin
View File

Binary file not shown.

2
demos/assets/default/raw/ui/main.xml
View File

@ -48,7 +48,7 @@
<button name="open:memtest" text="MemTest"/>
<button name="open:calibration_win" text="Calibration"/>
<button name="show_fps" text="Show FPS"/>
<button name="reload_theme" text="Reload Theme"/>
<button name="reload_theme" text="Test Change Theme"/>
<button name="exit" text="Exit"/>
</view>
</slide_view>

BIN
demos/assets/default/raw/ui/rich_text.bin
View File

Binary file not shown.

2
demos/demo_ui_app.c
View File

@ -432,7 +432,7 @@ static ret_t on_show_fps(void* ctx, event_t* e) {
}
static ret_t on_reload_theme_test(void* ctx, event_t* e) {
widget_set_theme(WIDGET(e->target), "default");
widget_set_theme(WIDGET(e->target), "dark");
return RET_OK;
}

6
docs/changes.md
View File

@ -1,8 +1,12 @@
# 最新动态
* 2019/10/18
* 增加动态切换主题的功能(实验阶段)。
* 2019/10/17
* 修改文档中的错误（感谢俊杰提供补丁）。
* 完善streams。
* 2019/10/16
* 更新文档。
* 修改文档中的错误（感谢俊杰提供补丁）。

34
src/base/assets_manager.c
View File

@ -147,13 +147,33 @@ static ret_t build_path(assets_manager_t* am, char* path, uint32_t size, bool_t
ratio = "x2";
}
return_value_if_fail(path_build(path, size, res_root, ASSETS_DIR, theme, subpath, ratio, name, NULL) == RET_OK,
RET_FAIL);
} else {
return_value_if_fail(path_build(path, size, res_root, ASSETS_DIR, theme, subpath, name, NULL) == RET_OK, RET_FAIL);
}
return_value_if_fail(
path_build(path, size, res_root, ASSETS_DIR, theme, subpath, ratio, name, NULL) == RET_OK,
RET_FAIL);
tk_str_append(path, size, extname);
if (!file_exist(path)) {
return_value_if_fail(path_build(path, size, res_root, ASSETS_DIR, THEME_DEFAULT, subpath,
ratio, name, NULL) == RET_OK,
RET_FAIL);
tk_str_append(path, size, extname);
}
return tk_str_append(path, size, extname);
return RET_OK;
} else {
return_value_if_fail(
path_build(path, size, res_root, ASSETS_DIR, theme, subpath, name, NULL) == RET_OK,
RET_FAIL);
tk_str_append(path, size, extname);
if (!file_exist(path)) {
return_value_if_fail(path_build(path, size, res_root, ASSETS_DIR, THEME_DEFAULT, subpath,
name, NULL) == RET_OK,
RET_FAIL);
tk_str_append(path, size, extname);
}
return RET_OK;
}
}
static asset_info_t* try_load_image(assets_manager_t* am, const char* name,
@ -448,7 +468,7 @@ assets_manager_t* assets_manager_init(assets_manager_t* am, uint32_t init_nr) {
darray_init(&(am->assets), init_nr, (tk_destroy_t)asset_info_unref,
(tk_compare_t)asset_cache_cmp_type);
assets_manager_set_theme(am, THEME_DEFAULT);
assets_manager_set_theme(am, THEME_DEFAULT);
return am;
}

9
src/base/assets_manager.h
View File

@ -125,7 +125,7 @@ ret_t assets_manager_set_res_root(assets_manager_t* am, const char* res_root);
/**
* @method assets_manager_set_theme
* 设置theme
*
*
* @param {assets_manager_t*} am asset manager对象。
* @param {const char*} theme theme
*
@ -229,6 +229,13 @@ ret_t assets_manager_preload(assets_manager_t* am, asset_type_t type, const char
*/
ret_t assets_manager_clear_cache(assets_manager_t* am, asset_type_t type);
/**
* @method assets_manager_clear_all
* 清除全部缓存的资源。
* @param {assets_manager_t*} am asset manager对象。
*
* @return {ret_t} 返回RET_OK表示成功，否则表示失败。
*/
ret_t assets_manager_clear_all(assets_manager_t* am);
/**

8
src/base/font_manager.h
View File

@ -143,6 +143,14 @@ font_t* font_manager_get_font(font_manager_t* fm, const char* name, font_size_t
*/
ret_t font_manager_unload_font(font_manager_t* fm, const char* name, font_size_t size);
/**
* @method font_manager_unload_all
* 卸载全部字体。
* @annotation ["scriptable"]
* @param {font_manager_t*} fm 字体管理器对象。
*
* @return {ret_t} 返回RET_OK表示成功，否则表示失败。
*/
ret_t font_manager_unload_all(font_manager_t* fm);
/**

8
src/base/image_manager.h
View File

@ -121,6 +121,14 @@ ret_t image_manager_get_bitmap(image_manager_t* imm, const char* name, bitmap_t*
*/
ret_t image_manager_unload_unused(image_manager_t* imm, uint32_t time_delta_s);
/**
* @method image_manager_unload_all
* 从图片管理器中卸载全部图片。
*
* @param {image_manager_t*} imm 图片管理器对象。
*
* @return {ret_t} 返回RET_OK表示成功，否则表示失败。
*/
ret_t image_manager_unload_all(image_manager_t* imm);
/**

5
src/base/widget.c
View File

@ -393,15 +393,14 @@ ret_t widget_set_theme(widget_t* widget, const char* name) {
canvas_t* canvas = widget_get_canvas(widget);
vgcanvas_t* vgcanvas = canvas_get_vgcanvas(canvas);
return_value_if_fail(am != NULL && name!= NULL, RET_BAD_PARAMS);
return_value_if_fail(am != NULL && name != NULL, RET_BAD_PARAMS);
font_manager_unload_all(fm);
image_manager_unload_all(imm);
assets_manager_set_theme(am, name);
vgcanvas_reset(vgcanvas);
info = assets_manager_ref(am, ASSET_TYPE_STYLE, "default");
ENSURE(info != NULL);
theme_init(theme(), info->data);
widget_dispatch(wm, &e);

7
src/base/widget.h
View File

@ -785,10 +785,13 @@ ret_t widget_set_name(widget_t* widget, const char* name);
/**
* @method widget_set_theme
* 设置theme。
* 设置theme的名称，用于动态切换主题。名称与当前主题名称相同，则重新加载全部资源。
*
* > 目前只支持带有文件系统的平台。
*
* @annotation ["scriptable"]
* @param {widget_t*} widget 控件对象。
* @param {char*} name 名称。
* @param {char*} name 主题的名称。
*
* @return {ret_t} 返回RET_OK表示成功，否则表示失败。
*/

5
src/base/window_base.c
View File

@ -77,12 +77,12 @@ static ret_t window_base_unload_theme_obj(widget_t* widget) {
window_base_t* window_base = WINDOW_BASE(widget);
assets_manager_t* am = widget_get_assets_manager(widget);
if(window_base->res_theme != NULL) {
if (window_base->res_theme != NULL) {
assets_manager_unref(am, window_base->res_theme);
window_base->res_theme = NULL;
}
if(window_base->theme_obj != NULL) {
if (window_base->theme_obj != NULL) {
theme_destroy(window_base->theme_obj);
window_base->theme_obj = NULL;
}
@ -97,7 +97,6 @@ static ret_t window_base_reload_theme_obj(widget_t* widget) {
return window_base_load_theme_obj(widget);
}
ret_t window_base_get_prop(widget_t* widget, const char* name, value_t* v) {
window_base_t* window_base = WINDOW_BASE(widget);
return_value_if_fail(widget != NULL && name != NULL && v != NULL, RET_BAD_PARAMS);

8
src/base/window_manager.c
View File

@ -341,12 +341,20 @@ static ret_t wm_on_locale_changed(void* ctx, event_t* e) {
return RET_OK;
}
static ret_t on_theme_changed(void* ctx, const void* data) {
widget_t* widget = WIDGET(data);
widget_update_style(widget);
return RET_OK;
}
ret_t window_manager_on_theme_changed(widget_t* widget) {
return_value_if_fail(widget != NULL, RET_BAD_PARAMS);
WIDGET_FOR_EACH_CHILD_BEGIN(widget, iter, i)
event_t e = event_init(EVT_THEME_CHANGED, iter);
widget_dispatch(iter, &e);
widget_foreach(iter, on_theme_changed, NULL);
WIDGET_FOR_EACH_CHILD_END();
return RET_OK;