add rich text view widget

This commit is contained in:
xianjimli 2020-04-24 16:13:45 +08:00
parent a0e00f39e9
commit 096cabb968
15 changed files with 483 additions and 42 deletions

View File

@ -1,5 +1,5 @@
TK_CONST_DATA_ALIGN(const unsigned char ui_main[]) = {
0x04,0x00,0x01,0x01,0xc4,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0x61,0x69,0x6e,0x00,0x64,0x61,0x74,
0x04,0x00,0x01,0x01,0x30,0x15,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,
@ -225,46 +225,51 @@ 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,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6e,0x61,
0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x64,0x72,0x61,0x67,0x67,0x61,0x62,0x6c,0x65,0x00,0x74,0x65,
0x78,0x74,0x00,0x44,0x72,0x61,0x67,0x67,0x61,0x62,0x6c,0x65,0x00,0x00,0x00,0x00,0x76,0x69,0x65,0x77,
0x78,0x74,0x00,0x44,0x72,0x61,0x67,0x67,0x61,0x62,0x6c,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,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x00,0x00,0x00,
0x64,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,0x30,0x2c,0x77,0x3d,0x31,0x30,0x30,0x25,0x2c,0x68,
0x3d,0x31,0x30,0x30,0x25,0x29,0x00,0x63,0x68,0x69,0x6c,0x64,0x72,0x65,0x6e,0x5f,0x6c,0x61,0x79,0x6f,
0x75,0x74,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x28,0x63,0x3d,0x31,0x2c,0x72,0x3d,0x38,0x2c,0x6d,
0x3d,0x35,0x2c,0x73,0x3d,0x35,0x29,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6e,0x61,
0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x72,0x69,0x63,0x68,0x5f,0x74,0x65,0x78,0x74,0x5f,0x76,0x69,
0x65,0x77,0x00,0x74,0x65,0x78,0x74,0x00,0x52,0x69,0x63,0x68,0x54,0x65,0x78,0x74,0x56,0x69,0x65,0x77,
0x00,0x00,0x00,0x00,0x76,0x69,0x65,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,0x00,0x00,0x00,0x66,0x6f,0x63,
0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,
0x6e,0x3a,0x6d,0x65,0x6d,0x74,0x65,0x73,0x74,0x00,0x74,0x65,0x78,0x74,0x00,0x4d,0x65,0x6d,0x54,0x65,
0x73,0x74,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x64,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,0x30,0x2c,
0x77,0x3d,0x31,0x30,0x30,0x25,0x2c,0x68,0x3d,0x31,0x30,0x30,0x25,0x29,0x00,0x63,0x68,0x69,0x6c,0x64,
0x72,0x65,0x6e,0x5f,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x28,0x63,
0x3d,0x31,0x2c,0x72,0x3d,0x38,0x2c,0x6d,0x3d,0x35,0x2c,0x73,0x3d,0x35,0x29,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,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,
0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x63,0x61,
0x6c,0x69,0x62,0x72,0x61,0x74,0x69,0x6f,0x6e,0x5f,0x77,0x69,0x6e,0x00,0x74,0x65,0x78,0x74,0x00,0x43,
0x61,0x6c,0x69,0x62,0x72,0x61,0x74,0x69,0x6f,0x6e,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,
0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,
0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x6d,0x65,0x6d,0x74,0x65,0x73,0x74,0x00,0x74,0x65,
0x78,0x74,0x00,0x4d,0x65,0x6d,0x54,0x65,0x73,0x74,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,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6e,0x61,0x6d,0x65,
0x00,0x73,0x68,0x6f,0x77,0x5f,0x66,0x70,0x73,0x00,0x74,0x65,0x78,0x74,0x00,0x53,0x68,0x6f,0x77,0x20,
0x46,0x50,0x53,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x6f,0x70,0x65,0x6e,0x3a,0x63,0x61,0x6c,0x69,0x62,0x72,0x61,0x74,0x69,0x6f,0x6e,0x5f,0x77,0x69,
0x6e,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x61,0x6c,0x69,0x62,0x72,0x61,0x74,0x69,0x6f,0x6e,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,0x66,0x6f,0x63,0x75,0x73,0x61,
0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6e,0x61,0x6d,0x65,0x00,0x73,0x6e,0x61,0x70,0x73,0x68,
0x6f,0x74,0x00,0x74,0x65,0x78,0x74,0x00,0x54,0x61,0x6b,0x65,0x20,0x53,0x6e,0x61,0x70,0x73,0x68,0x6f,
0x74,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,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,
0x72,0x75,0x65,0x00,0x6e,0x61,0x6d,0x65,0x00,0x73,0x68,0x6f,0x77,0x5f,0x66,0x70,0x73,0x00,0x74,0x65,
0x78,0x74,0x00,0x53,0x68,0x6f,0x77,0x20,0x46,0x50,0x53,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,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,
0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6e,0x61,0x6d,0x65,0x00,0x72,0x65,0x6c,0x6f,0x61,0x64,0x5f,0x74,
0x68,0x65,0x6d,0x65,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,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,
0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,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,};/*5364*/
0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6e,0x61,0x6d,
0x65,0x00,0x73,0x6e,0x61,0x70,0x73,0x68,0x6f,0x74,0x00,0x74,0x65,0x78,0x74,0x00,0x54,0x61,0x6b,0x65,
0x20,0x53,0x6e,0x61,0x70,0x73,0x68,0x6f,0x74,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,
0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x6e,0x61,0x6d,0x65,0x00,
0x72,0x65,0x6c,0x6f,0x61,0x64,0x5f,0x74,0x68,0x65,0x6d,0x65,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,0x00,0x00,0x00,0x00,0x00,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,
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,};/*5472*/

View File

@ -0,0 +1,180 @@
TK_CONST_DATA_ALIGN(const unsigned char ui_rich_text_view[]) = {
0x04,0x00,0x01,0x01,0xc0,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x72,0x69,0x63,0x68,0x5f,0x74,0x65,0x78,
0x74,0x5f,0x76,0x69,0x65,0x77,0x00,0x64,0x61,0x74,0x61,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,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x61,0x6e,0x69,0x6d,
0x5f,0x68,0x69,0x6e,0x74,0x00,0x68,0x74,0x72,0x61,0x6e,0x73,0x6c,0x61,0x74,0x65,0x00,0x00,0x72,0x69,
0x63,0x68,0x5f,0x74,0x65,0x78,0x74,0x5f,0x76,0x69,0x65,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,0x64,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,0x30,0x2c,0x79,0x3d,0x30,0x2c,0x77,0x3d,0x31,0x30,0x30,0x25,
0x2c,0x68,0x3d,0x34,0x30,0x25,0x29,0x00,0x00,0x72,0x69,0x63,0x68,0x5f,0x74,0x65,0x78,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,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xf4,0xff,0xff,0xff,0x64,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,0x31,0x30,0x2c,0x77,0x3d,0x2d,0x31,0x32,0x2c,0x68,0x3d,0x31,0x30,0x30,0x25,0x29,0x00,
0x6c,0x69,0x6e,0x65,0x5f,0x67,0x61,0x70,0x00,0x35,0x00,0x6d,0x61,0x72,0x67,0x69,0x6e,0x00,0x31,0x30,
0x00,0x74,0x65,0x78,0x74,0x00,0x3c,0x69,0x6d,0x61,0x67,0x65,0x20,0x6e,0x61,0x6d,0x65,0x3d,0x22,0x62,
0x72,0x69,0x63,0x6b,0x73,0x22,0x2f,0x3e,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3d,
0x22,0x67,0x6f,0x6c,0x64,0x22,0x20,0x61,0x6c,0x69,0x67,0x6e,0x5f,0x76,0x3d,0x22,0x62,0x6f,0x74,0x74,
0x6f,0x6d,0x22,0x20,0x73,0x69,0x7a,0x65,0x3d,0x22,0x32,0x34,0x22,0x3e,0x31,0x2e,0x68,0x65,0x6c,0x6c,
0x6f,0x20,0x61,0x77,0x74,0x6b,0x21,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x3c,0x66,0x6f,0x6e,0x74,0x20,
0x63,0x6f,0x6c,0x6f,0x72,0x3d,0x22,0x67,0x72,0x65,0x65,0x6e,0x22,0x20,0x73,0x69,0x7a,0x65,0x3d,0x22,
0x32,0x30,0x22,0x3e,0x50,0x72,0x6f,0x54,0x69,0x70,0x21,0x20,0x54,0x68,0x65,0x20,0x66,0x65,0x65,0x64,
0x20,0x73,0x68,0x6f,0x77,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,0x68,0x65,0x6c,0x6c,0x6f,0x20,0x77,0x6f,0x72,0x6c,0x64,
0x21,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x0a,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,0x31,0x2e,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,0x0a,
0x3c,0x69,0x6d,0x61,0x67,0x65,0x20,0x6e,0x61,0x6d,0x65,0x3d,0x22,0x62,0x72,0x69,0x63,0x6b,0x73,0x22,
0x2f,0x3e,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3d,0x22,0x67,0x6f,0x6c,0x64,0x22,
0x20,0x61,0x6c,0x69,0x67,0x6e,0x5f,0x76,0x3d,0x22,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x22,0x20,0x73,0x69,
0x7a,0x65,0x3d,0x22,0x32,0x34,0x22,0x3e,0x31,0x2e,0x68,0x65,0x6c,0x6c,0x6f,0x20,0x61,0x77,0x74,0x6b,
0x21,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3d,
0x22,0x67,0x72,0x65,0x65,0x6e,0x22,0x20,0x73,0x69,0x7a,0x65,0x3d,0x22,0x32,0x30,0x22,0x3e,0x50,0x72,
0x6f,0x54,0x69,0x70,0x21,0x20,0x54,0x68,0x65,0x20,0x66,0x65,0x65,0x64,0x20,0x73,0x68,0x6f,0x77,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,0x68,0x65,0x6c,0x6c,0x6f,0x20,0x77,0x6f,0x72,0x6c,0x64,0x21,0x3c,0x2f,0x66,0x6f,0x6e,
0x74,0x3e,0x0a,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,0x32,0x2e,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,0x0a,0x3c,0x69,0x6d,0x61,0x67,0x65,
0x20,0x6e,0x61,0x6d,0x65,0x3d,0x22,0x62,0x72,0x69,0x63,0x6b,0x73,0x22,0x2f,0x3e,0x3c,0x66,0x6f,0x6e,
0x74,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3d,0x22,0x67,0x6f,0x6c,0x64,0x22,0x20,0x61,0x6c,0x69,0x67,0x6e,
0x5f,0x76,0x3d,0x22,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x22,0x20,0x73,0x69,0x7a,0x65,0x3d,0x22,0x32,0x34,
0x22,0x3e,0x31,0x2e,0x68,0x65,0x6c,0x6c,0x6f,0x20,0x61,0x77,0x74,0x6b,0x21,0x3c,0x2f,0x66,0x6f,0x6e,
0x74,0x3e,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3d,0x22,0x67,0x72,0x65,0x65,0x6e,
0x22,0x20,0x73,0x69,0x7a,0x65,0x3d,0x22,0x32,0x30,0x22,0x3e,0x50,0x72,0x6f,0x54,0x69,0x70,0x21,0x20,
0x54,0x68,0x65,0x20,0x66,0x65,0x65,0x64,0x20,0x73,0x68,0x6f,0x77,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,0x68,0x65,0x6c,
0x6c,0x6f,0x20,0x77,0x6f,0x72,0x6c,0x64,0x21,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x0a,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,0x33,0x2e,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,0x0a,0x3c,0x69,0x6d,0x61,0x67,0x65,0x20,0x6e,0x61,0x6d,0x65,0x3d,
0x22,0x62,0x72,0x69,0x63,0x6b,0x73,0x22,0x2f,0x3e,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x63,0x6f,0x6c,0x6f,
0x72,0x3d,0x22,0x67,0x6f,0x6c,0x64,0x22,0x20,0x61,0x6c,0x69,0x67,0x6e,0x5f,0x76,0x3d,0x22,0x62,0x6f,
0x74,0x74,0x6f,0x6d,0x22,0x20,0x73,0x69,0x7a,0x65,0x3d,0x22,0x32,0x34,0x22,0x3e,0x31,0x2e,0x68,0x65,
0x6c,0x6c,0x6f,0x20,0x61,0x77,0x74,0x6b,0x21,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x3c,0x66,0x6f,0x6e,
0x74,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3d,0x22,0x67,0x72,0x65,0x65,0x6e,0x22,0x20,0x73,0x69,0x7a,0x65,
0x3d,0x22,0x32,0x30,0x22,0x3e,0x50,0x72,0x6f,0x54,0x69,0x70,0x21,0x20,0x54,0x68,0x65,0x20,0x66,0x65,
0x65,0x64,0x20,0x73,0x68,0x6f,0x77,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,0x68,0x65,0x6c,0x6c,0x6f,0x20,0x77,0x6f,0x72,
0x6c,0x64,0x21,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x0a,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,0x34,
0x2e,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,0x73,0x63,0x72,0x6f,0x6c,0x6c,0x5f,0x62,0x61,0x72,0x5f,0x64,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x64,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,0x72,0x69,0x67,0x68,0x74,0x2c,
0x79,0x3d,0x30,0x2c,0x77,0x3d,0x31,0x32,0x2c,0x68,0x3d,0x31,0x30,0x30,0x25,0x29,0x00,0x6e,0x61,0x6d,
0x65,0x00,0x62,0x61,0x72,0x00,0x76,0x61,0x6c,0x75,0x65,0x00,0x30,0x00,0x72,0x6f,0x77,0x00,0x33,0x30,
0x00,0x00,0x00,0x00,0x72,0x69,0x63,0x68,0x5f,0x74,0x65,0x78,0x74,0x5f,0x76,0x69,0x65,0x77,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x2d,0x00,0x00,0x00,0x64,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,0x30,0x2c,0x79,0x3d,0x34,0x35,
0x25,0x2c,0x77,0x3d,0x31,0x30,0x30,0x25,0x2c,0x68,0x3d,0x34,0x30,0x25,0x29,0x00,0x00,0x72,0x69,0x63,
0x68,0x5f,0x74,0x65,0x78,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,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xfa,0xff,0xff,
0xff,0x64,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,0x31,0x30,0x2c,0x77,0x3d,0x2d,0x36,0x2c,0x68,
0x3d,0x31,0x30,0x30,0x25,0x29,0x00,0x6c,0x69,0x6e,0x65,0x5f,0x67,0x61,0x70,0x00,0x35,0x00,0x6d,0x61,
0x72,0x67,0x69,0x6e,0x00,0x31,0x30,0x00,0x74,0x65,0x78,0x74,0x00,0x3c,0x69,0x6d,0x61,0x67,0x65,0x20,
0x6e,0x61,0x6d,0x65,0x3d,0x22,0x62,0x72,0x69,0x63,0x6b,0x73,0x22,0x2f,0x3e,0x3c,0x66,0x6f,0x6e,0x74,
0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3d,0x22,0x67,0x6f,0x6c,0x64,0x22,0x20,0x61,0x6c,0x69,0x67,0x6e,0x5f,
0x76,0x3d,0x22,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x22,0x20,0x73,0x69,0x7a,0x65,0x3d,0x22,0x32,0x34,0x22,
0x3e,0x31,0x2e,0x68,0x65,0x6c,0x6c,0x6f,0x20,0x61,0x77,0x74,0x6b,0x21,0x3c,0x2f,0x66,0x6f,0x6e,0x74,
0x3e,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3d,0x22,0x67,0x72,0x65,0x65,0x6e,0x22,
0x20,0x73,0x69,0x7a,0x65,0x3d,0x22,0x32,0x30,0x22,0x3e,0x50,0x72,0x6f,0x54,0x69,0x70,0x21,0x20,0x54,
0x68,0x65,0x20,0x66,0x65,0x65,0x64,0x20,0x73,0x68,0x6f,0x77,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,0x68,0x65,0x6c,0x6c,
0x6f,0x20,0x77,0x6f,0x72,0x6c,0x64,0x21,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x0a,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,0x31,0x2e,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,0x0a,0x3c,0x69,0x6d,0x61,0x67,0x65,0x20,0x6e,0x61,0x6d,0x65,0x3d,0x22,
0x62,0x72,0x69,0x63,0x6b,0x73,0x22,0x2f,0x3e,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x63,0x6f,0x6c,0x6f,0x72,
0x3d,0x22,0x67,0x6f,0x6c,0x64,0x22,0x20,0x61,0x6c,0x69,0x67,0x6e,0x5f,0x76,0x3d,0x22,0x62,0x6f,0x74,
0x74,0x6f,0x6d,0x22,0x20,0x73,0x69,0x7a,0x65,0x3d,0x22,0x32,0x34,0x22,0x3e,0x31,0x2e,0x68,0x65,0x6c,
0x6c,0x6f,0x20,0x61,0x77,0x74,0x6b,0x21,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x3c,0x66,0x6f,0x6e,0x74,
0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3d,0x22,0x67,0x72,0x65,0x65,0x6e,0x22,0x20,0x73,0x69,0x7a,0x65,0x3d,
0x22,0x32,0x30,0x22,0x3e,0x50,0x72,0x6f,0x54,0x69,0x70,0x21,0x20,0x54,0x68,0x65,0x20,0x66,0x65,0x65,
0x64,0x20,0x73,0x68,0x6f,0x77,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,0x68,0x65,0x6c,0x6c,0x6f,0x20,0x77,0x6f,0x72,0x6c,
0x64,0x21,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x0a,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,0x32,0x2e,
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,
0x0a,0x3c,0x69,0x6d,0x61,0x67,0x65,0x20,0x6e,0x61,0x6d,0x65,0x3d,0x22,0x62,0x72,0x69,0x63,0x6b,0x73,
0x22,0x2f,0x3e,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3d,0x22,0x67,0x6f,0x6c,0x64,
0x22,0x20,0x61,0x6c,0x69,0x67,0x6e,0x5f,0x76,0x3d,0x22,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x22,0x20,0x73,
0x69,0x7a,0x65,0x3d,0x22,0x32,0x34,0x22,0x3e,0x31,0x2e,0x68,0x65,0x6c,0x6c,0x6f,0x20,0x61,0x77,0x74,
0x6b,0x21,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x63,0x6f,0x6c,0x6f,0x72,
0x3d,0x22,0x67,0x72,0x65,0x65,0x6e,0x22,0x20,0x73,0x69,0x7a,0x65,0x3d,0x22,0x32,0x30,0x22,0x3e,0x50,
0x72,0x6f,0x54,0x69,0x70,0x21,0x20,0x54,0x68,0x65,0x20,0x66,0x65,0x65,0x64,0x20,0x73,0x68,0x6f,0x77,
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,0x68,0x65,0x6c,0x6c,0x6f,0x20,0x77,0x6f,0x72,0x6c,0x64,0x21,0x3c,0x2f,0x66,0x6f,
0x6e,0x74,0x3e,0x0a,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,0x33,0x2e,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,0x0a,0x3c,0x69,0x6d,0x61,0x67,
0x65,0x20,0x6e,0x61,0x6d,0x65,0x3d,0x22,0x62,0x72,0x69,0x63,0x6b,0x73,0x22,0x2f,0x3e,0x3c,0x66,0x6f,
0x6e,0x74,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3d,0x22,0x67,0x6f,0x6c,0x64,0x22,0x20,0x61,0x6c,0x69,0x67,
0x6e,0x5f,0x76,0x3d,0x22,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x22,0x20,0x73,0x69,0x7a,0x65,0x3d,0x22,0x32,
0x34,0x22,0x3e,0x31,0x2e,0x68,0x65,0x6c,0x6c,0x6f,0x20,0x61,0x77,0x74,0x6b,0x21,0x3c,0x2f,0x66,0x6f,
0x6e,0x74,0x3e,0x3c,0x66,0x6f,0x6e,0x74,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3d,0x22,0x67,0x72,0x65,0x65,
0x6e,0x22,0x20,0x73,0x69,0x7a,0x65,0x3d,0x22,0x32,0x30,0x22,0x3e,0x50,0x72,0x6f,0x54,0x69,0x70,0x21,
0x20,0x54,0x68,0x65,0x20,0x66,0x65,0x65,0x64,0x20,0x73,0x68,0x6f,0x77,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,0x68,0x65,
0x6c,0x6c,0x6f,0x20,0x77,0x6f,0x72,0x6c,0x64,0x21,0x3c,0x2f,0x66,0x6f,0x6e,0x74,0x3e,0x0a,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,0x34,0x2e,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,0x73,0x63,0x72,0x6f,0x6c,0x6c,0x5f,0x62,0x61,
0x72,0x5f,0x6d,0x00,0x00,0x00,0x00,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,0x00,0x00,0x64,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,0x72,0x69,0x67,0x68,0x74,0x2c,0x79,0x3d,0x30,0x2c,0x77,0x3d,0x36,0x2c,0x68,0x3d,0x31,0x30,0x30,
0x25,0x29,0x00,0x6e,0x61,0x6d,0x65,0x00,0x62,0x61,0x72,0x00,0x76,0x61,0x6c,0x75,0x65,0x00,0x30,0x00,
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,};/*3568*/

Binary file not shown.

View File

@ -46,6 +46,7 @@
</view>
<view x="0" y="0" w="100%" h="100%" children_layout="default(c=2,r=8,m=5,s=5)">
<button focusable="true" name="open:draggable" text="Draggable"/>
<button focusable="true" name="open:rich_text_view" text="RichTextView"/>
</view>
<view x="0" y="0" w="100%" h="100%" children_layout="default(c=1,r=8,m=5,s=5)">
<button focusable="true" name="open:memtest" text="MemTest"/>

Binary file not shown.

View File

@ -0,0 +1,39 @@
<window anim_hint="htranslate" >
<rich_text_view x="0" y="0" w="100%" h="40%">
<rich_text line_gap="5" x="0" y="10" w="-12" h="100%" margin="10">
<property name="text">
<![CDATA[
<image name="bricks"/><font color="gold" align_v="bottom" size="24">1.hello awtk!</font><font color="green" size="20">ProTip! The feed shows you events from people you follow and repositories you watch. hello world!</font>
<font color="red" size="20">1.确定取消中文字符测试。确定。取消。中文字符测试。</font>"
<image name="bricks"/><font color="gold" align_v="bottom" size="24">1.hello awtk!</font><font color="green" size="20">ProTip! The feed shows you events from people you follow and repositories you watch. hello world!</font>
<font color="red" size="20">2.确定取消中文字符测试。确定。取消。中文字符测试。</font>"
<image name="bricks"/><font color="gold" align_v="bottom" size="24">1.hello awtk!</font><font color="green" size="20">ProTip! The feed shows you events from people you follow and repositories you watch. hello world!</font>
<font color="red" size="20">3.确定取消中文字符测试。确定。取消。中文字符测试。</font>"
<image name="bricks"/><font color="gold" align_v="bottom" size="24">1.hello awtk!</font><font color="green" size="20">ProTip! The feed shows you events from people you follow and repositories you watch. hello world!</font>
<font color="red" size="20">4.确定取消中文字符测试。确定。取消。中文字符测试。</font>"
]]>
</property>
</rich_text>
<scroll_bar_d name="bar" x="right" y="0" w="12" h="100%" value="0" row="30"/>
</rich_text_view>
<rich_text_view x="0" y="45%" w="100%" h="40%">
<rich_text line_gap="5" x="0" y="10" w="-6" h="100%" margin="10">
<property name="text">
<![CDATA[
<image name="bricks"/><font color="gold" align_v="bottom" size="24">1.hello awtk!</font><font color="green" size="20">ProTip! The feed shows you events from people you follow and repositories you watch. hello world!</font>
<font color="red" size="20">1.确定取消中文字符测试。确定。取消。中文字符测试。</font>"
<image name="bricks"/><font color="gold" align_v="bottom" size="24">1.hello awtk!</font><font color="green" size="20">ProTip! The feed shows you events from people you follow and repositories you watch. hello world!</font>
<font color="red" size="20">2.确定取消中文字符测试。确定。取消。中文字符测试。</font>"
<image name="bricks"/><font color="gold" align_v="bottom" size="24">1.hello awtk!</font><font color="green" size="20">ProTip! The feed shows you events from people you follow and repositories you watch. hello world!</font>
<font color="red" size="20">3.确定取消中文字符测试。确定。取消。中文字符测试。</font>"
<image name="bricks"/><font color="gold" align_v="bottom" size="24">1.hello awtk!</font><font color="green" size="20">ProTip! The feed shows you events from people you follow and repositories you watch. hello world!</font>
<font color="red" size="20">4.确定取消中文字符测试。确定。取消。中文字符测试。</font>"
]]>
</property>
</rich_text>
<scroll_bar_m name="bar" x="right" y="0" w="6" h="100%" value="0"/>
</rich_text_view>
<button name="close" text="Close" x="c" y="bottom:10" w="25%" h="40" />
</window>

View File

@ -110,6 +110,7 @@ extern TK_CONST_DATA_ALIGN(const unsigned char ui_test_view[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_auto_play_portrait[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_system_bar_bottom[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_text_selector[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_rich_text_view[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_big_font[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_tab_top_compact[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_slide_view_h[]);
@ -445,7 +446,7 @@ extern TK_CONST_DATA_ALIGN(const unsigned char image_girl[]);
extern TK_CONST_DATA_ALIGN(const unsigned char font_ap[]);
extern TK_CONST_DATA_ALIGN(const unsigned char font_default_full[]);
extern TK_CONST_DATA_ALIGN(const unsigned char font_default[]);
#else /*WITH_STB_FONT or WITH_FT_FONT*/
#else/*WITH_STB_FONT or WITH_FT_FONT*/
extern TK_CONST_DATA_ALIGN(const unsigned char font_default_20[]);
extern TK_CONST_DATA_ALIGN(const unsigned char font_default_16[]);
extern TK_CONST_DATA_ALIGN(const unsigned char font_default_18[]);
@ -572,6 +573,7 @@ ret_t assets_init_dark(void) {
assets_manager_add(am, ui_auto_play_portrait);
assets_manager_add(am, ui_system_bar_bottom);
assets_manager_add(am, ui_text_selector);
assets_manager_add(am, ui_rich_text_view);
assets_manager_add(am, ui_big_font);
assets_manager_add(am, ui_tab_top_compact);
assets_manager_add(am, ui_slide_view_h);
@ -762,7 +764,7 @@ ret_t assets_init_dark(void) {
assets_manager_add(am, font_ap);
assets_manager_add(am, font_default_full);
assets_manager_add(am, font_default);
#else /*WITH_STB_FONT or WITH_FT_FONT*/
#else /*WITH_STB_FONT or WITH_FT_FONT*/
assets_manager_add(am, font_default_20);
assets_manager_add(am, font_default_16);
assets_manager_add(am, font_default_18);

View File

@ -110,6 +110,7 @@
#include "assets/default/inc/ui/auto_play_portrait.data"
#include "assets/default/inc/ui/system_bar_bottom.data"
#include "assets/default/inc/ui/text_selector.data"
#include "assets/default/inc/ui/rich_text_view.data"
#include "assets/default/inc/ui/big_font.data"
#include "assets/default/inc/ui/tab_top_compact.data"
#include "assets/default/inc/ui/slide_view_h.data"
@ -445,7 +446,7 @@
#include "assets/default/inc/fonts/ap.res"
#include "assets/default/inc/fonts/default_full.res"
#include "assets/default/inc/fonts/default.res"
#else /*WITH_STB_FONT or WITH_FT_FONT*/
#else/*WITH_STB_FONT or WITH_FT_FONT*/
#include "assets/default/inc/fonts/default_20.data"
#include "assets/default/inc/fonts/default_16.data"
#include "assets/default/inc/fonts/default_18.data"
@ -572,6 +573,7 @@ ret_t assets_init_default(void) {
assets_manager_add(am, ui_auto_play_portrait);
assets_manager_add(am, ui_system_bar_bottom);
assets_manager_add(am, ui_text_selector);
assets_manager_add(am, ui_rich_text_view);
assets_manager_add(am, ui_big_font);
assets_manager_add(am, ui_tab_top_compact);
assets_manager_add(am, ui_slide_view_h);
@ -762,7 +764,7 @@ ret_t assets_init_default(void) {
assets_manager_add(am, font_ap);
assets_manager_add(am, font_default_full);
assets_manager_add(am, font_default);
#else /*WITH_STB_FONT or WITH_FT_FONT*/
#else /*WITH_STB_FONT or WITH_FT_FONT*/
assets_manager_add(am, font_default_20);
assets_manager_add(am, font_default_16);
assets_manager_add(am, font_default_18);

View File

@ -1,5 +1,9 @@
# 最新动态
* 2020/04/24
* 增加 rich text view 控件用于协调 rich text 和 scroll bar。
* 2020/04/23
* 去掉 widget 中不必要的 log。
* rich text 支持滚动。

View File

@ -33,6 +33,7 @@
#include "keyboard/lang_indicator.h"
#include "base/widget_factory.h"
#include "rich_text/rich_text.h"
#include "rich_text/rich_text_view.h"
#include "slide_menu/slide_menu.h"
#include "image_value/image_value.h"
#include "time_clock/time_clock.h"
@ -72,6 +73,7 @@ ret_t tk_ext_widgets_init() {
widget_factory_t* f = widget_factory();
widget_factory_register(f, WIDGET_TYPE_RICH_TEXT, rich_text_create);
widget_factory_register(f, WIDGET_TYPE_RICH_TEXT_VIEW, rich_text_view_create);
widget_factory_register(f, WIDGET_TYPE_COLOR_PICKER, color_picker_create);
widget_factory_register(f, WIDGET_TYPE_COLOR_COMPONENT, color_component_create);
widget_factory_register(f, WIDGET_TYPE_SCROLL_VIEW, scroll_view_create);

View File

@ -179,6 +179,7 @@ static ret_t rich_text_ensure_render_node(widget_t* widget, canvas_t* c) {
rich_text->render_node =
rich_text_render_node_layout(widget, rich_text->node, c, w, h, margin, line_gap);
widget_set_prop_int(WIDGET(rich_text), WIDGET_PROP_YOFFSET, 0);
}
return_value_if_fail(rich_text->render_node != NULL, RET_OOM);
@ -288,7 +289,8 @@ static ret_t rich_text_on_pointer_move(rich_text_t* rich_text, pointer_event_t*
velocity_update(v, e->e.time, e->x, e->y);
if (rich_text->wa == NULL && dy) {
rich_text->yoffset = rich_text->yoffset_save - dy;
int32_t yoffset = rich_text->yoffset_save - dy;
widget_set_prop_int(WIDGET(rich_text), WIDGET_PROP_YOFFSET, yoffset);
}
return RET_OK;
@ -472,6 +474,9 @@ static ret_t rich_text_get_prop(widget_t* widget, const char* name, value_t* v)
} else if (tk_str_eq(name, WIDGET_PROP_XOFFSET)) {
value_set_int(v, 0);
return RET_OK;
} else if (tk_str_eq(name, WIDGET_PROP_VIRTUAL_H)) {
value_set_int(v, rich_text->content_h + 2 * rich_text->margin);
return RET_OK;
}
return RET_NOT_FOUND;

View File

@ -0,0 +1,105 @@
/**
* File: rich_text_view.h
* Author: AWTK Develop Team
* Brief: rich_text_view
*
* Copyright (c) 2018 - 2020 Guangzhou ZHIYUAN Electronics Co.,Ltd.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* License file for more details.
*
*/
/**
* History:
* ================================================================
* 2018-04-05 Li XianJing <xianjimli@hotmail.com> created
*
*/
#include "tkc/mem.h"
#include "tkc/utils.h"
#include "scroll_view/scroll_bar.h"
#include "rich_text/rich_text.h"
#include "rich_text/rich_text_view.h"
static ret_t rich_text_view_on_scroll_bar_changed(void* ctx, event_t* e) {
rich_text_view_t* rich_text_view = RICH_TEXT_VIEW(ctx);
rich_text_t* rich_text = RICH_TEXT(rich_text_view->rich_text);
int32_t yoffset = widget_get_value(rich_text_view->scroll_bar);
if (rich_text != NULL) {
emitter_disable(rich_text_view->rich_text->emitter);
widget_set_prop_int(rich_text_view->rich_text, WIDGET_PROP_YOFFSET, yoffset);
emitter_enable(rich_text_view->rich_text->emitter);
}
return RET_OK;
}
static ret_t rich_text_view_on_rich_text_scrolled(void* ctx, event_t* e) {
rich_text_view_t* rich_text_view = RICH_TEXT_VIEW(ctx);
int32_t yoffset = widget_get_prop_int(rich_text_view->rich_text, WIDGET_PROP_YOFFSET, 0);
int32_t virtual_h = widget_get_prop_int(rich_text_view->rich_text, WIDGET_PROP_VIRTUAL_H, 0);
if (rich_text_view->scroll_bar != NULL) {
virtual_h -= rich_text_view->scroll_bar->h;
emitter_disable(rich_text_view->scroll_bar->emitter);
widget_set_prop_int(rich_text_view->scroll_bar, WIDGET_PROP_VALUE, yoffset);
widget_set_prop_int(rich_text_view->scroll_bar, WIDGET_PROP_MAX, virtual_h);
emitter_enable(rich_text_view->scroll_bar->emitter);
}
return RET_OK;
}
static ret_t rich_text_view_on_add_child(widget_t* widget, widget_t* child) {
rich_text_view_t* rich_text_view = RICH_TEXT_VIEW(widget);
if (tk_str_eq(widget_get_type(child), WIDGET_TYPE_RICH_TEXT)) {
rich_text_view->rich_text = child;
widget_on(child, EVT_PROP_CHANGED, rich_text_view_on_rich_text_scrolled, widget);
} else if (tk_str_eq(widget_get_type(child), WIDGET_TYPE_SCROLL_BAR) ||
tk_str_eq(widget_get_type(child), WIDGET_TYPE_SCROLL_BAR_DESKTOP) ||
tk_str_eq(widget_get_type(child), WIDGET_TYPE_SCROLL_BAR_MOBILE)) {
rich_text_view->scroll_bar = child;
widget_on(child, EVT_VALUE_CHANGED, rich_text_view_on_scroll_bar_changed, widget);
}
return RET_FAIL;
}
static ret_t rich_text_view_on_remove_child(widget_t* widget, widget_t* child) {
rich_text_view_t* rich_text_view = RICH_TEXT_VIEW(widget);
widget_off_by_ctx(child, widget);
if (rich_text_view->rich_text == child) {
rich_text_view->rich_text = NULL;
}
if (rich_text_view->scroll_bar == child) {
rich_text_view->scroll_bar = NULL;
}
return RET_FAIL;
}
TK_DECL_VTABLE(rich_text_view) = {.size = sizeof(rich_text_view_t),
.type = WIDGET_TYPE_RICH_TEXT_VIEW,
.parent = TK_PARENT_VTABLE(widget),
.on_add_child = rich_text_view_on_add_child,
.on_remove_child = rich_text_view_on_remove_child,
.create = rich_text_view_create};
widget_t* rich_text_view_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h) {
return widget_create(parent, TK_REF_VTABLE(rich_text_view), x, y, w, h);
}
widget_t* rich_text_view_cast(widget_t* widget) {
return_value_if_fail(WIDGET_IS_INSTANCE_OF(widget, rich_text_view), NULL);
return widget;
}

View File

@ -0,0 +1,95 @@
/**
* File: rich_text_view.h
* Author: AWTK Develop Team
* Brief: rich_text_view
*
* Copyright (c) 2018 - 2020 Guangzhou ZHIYUAN Electronics Co.,Ltd.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* License file for more details.
*
*/
/**
* History:
* ================================================================
* 2020-04-24 Li XianJing <xianjimli@hotmail.com> created
*
*/
#ifndef TK_RICH_TEXT_VIEW_H
#define TK_RICH_TEXT_VIEW_H
#include "base/widget.h"
BEGIN_C_DECLS
/**
* @class rich_text_view_t
* @parent widget_t
* @annotation ["scriptable","design","widget"]
*
* rich_text_view是一个专用容器rich text和 scroll bar
*
* rich_text_view\_t是[widget\_t](widget_t.md)widget\_t的函数均适用于rich_text_view\_t控件
*
* xml中使用"rich_text_view"rich_text_view
*
* ```xml
* <rich_text_view x="0" y="10" w="100%" h="300">
* <rich_text line_gap="5" x="0" y="10" w="-12" h="100%" margin="10">
* ...
* </rich_text>
* <scroll_bar_d name="bar" x="right" y="0" w="12" h="100%" value="0"/>
* </rich_text_view>
* ```
*
* style来设置控件的显示风格
*
* ```xml
* <style name="default" border_color="#a0a0a0">
* <normal bg_color="#f0f0f0" />
* </style>
* ```
*/
typedef struct _rich_text_view_t {
widget_t widget;
/*private*/
widget_t* scroll_bar;
widget_t* rich_text;
} rich_text_view_t;
/**
* @method rich_text_view_create
* rich_text_view对象
* @annotation ["constructor", "scriptable"]
* @param {widget_t*} parent
* @param {xy_t} x x坐标
* @param {xy_t} y y坐标
* @param {wh_t} w
* @param {wh_t} h
*
* @return {widget_t*}
*/
widget_t* rich_text_view_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h);
/**
* @method rich_text_view_cast
* rich_text_view对象(使)
* @annotation ["cast", "scriptable"]
* @param {widget_t*} widget rich_text_view对象
*
* @return {widget_t*} rich_text_view对象
*/
widget_t* rich_text_view_cast(widget_t* widget);
#define WIDGET_TYPE_RICH_TEXT_VIEW "rich_text_view"
#define RICH_TEXT_VIEW(widget) ((rich_text_view_t*)(rich_text_view_cast(WIDGET(widget))))
END_C_DECLS
#endif /*TK_RICH_TEXT_VIEW_H*/

View File

@ -368,6 +368,7 @@ static ret_t scroll_bar_create_children(widget_t* widget) {
widget_use_style(down, "scroll_down");
}
scroll_bar->row = 30;
scroll_bar->dragger = dragger;
widget_set_need_relayout_children(widget);

View File

@ -718,8 +718,8 @@ static ret_t window_manager_animate_done(widget_t* widget) {
} else {
window_manager_close_window(widget, window);
}
}
}
if (wm->pending_open_window != NULL) {
widget_t* window = wm->pending_open_window;
wm->pending_open_window = NULL;