diff --git a/demos/assets.c b/demos/assets.c index 4fefcb313..0cc254596 100644 --- a/demos/assets.c +++ b/demos/assets.c @@ -397,7 +397,7 @@ #include "assets/default/inc/images/visible.data" #include "assets/default/inc/images/warn.data" #include "assets/default/inc/images/zh.data" -#endif /*WITH_STB_IMAGE*/ +#endif/*WITH_STB_IMAGE*/ #ifdef WITH_VGCANVAS #include "assets/default/inc/images/ball.bsvg" #include "assets/default/inc/images/china.bsvg" @@ -405,13 +405,13 @@ #include "assets/default/inc/images/pointer.bsvg" #include "assets/default/inc/images/pointer_1.bsvg" #include "assets/default/inc/images/pointer_4.bsvg" -#endif /*WITH_VGCANVAS*/ +#endif/*WITH_VGCANVAS*/ #if defined(WITH_TRUETYPE_FONT) #include "assets/default/inc/fonts/default.res" -#else /*WITH_TRUETYPE_FONT*/ +#else/*WITH_TRUETYPE_FONT*/ #include "assets/default/inc/fonts/default.data" -#endif /*WITH_TRUETYPE_FONT*/ -#endif /*WITH_FS_RES*/ +#endif/*WITH_TRUETYPE_FONT*/ +#endif/*WITH_FS_RES*/ ret_t assets_init(void) { assets_manager_t* am = assets_manager(); @@ -701,7 +701,7 @@ ret_t assets_init(void) { assets_manager_add(am, image_pointer); assets_manager_add(am, image_pointer_1); assets_manager_add(am, image_pointer_4); -#endif /*WITH_VGCANVAS*/ +#endif/*WITH_VGCANVAS*/ #endif tk_init_assets(); diff --git a/demos/assets/default/inc/styles/button.data b/demos/assets/default/inc/styles/button.data index 03ecbb531..433d42816 100644 --- a/demos/assets/default/inc/styles/button.data +++ b/demos/assets/default/inc/styles/button.data @@ -138,16 +138,16 @@ TK_CONST_DATA_ALIGN(const unsigned char style_button[]) = { 0xd0,0xd0,0xd0,0xff,0x07,0x09,0x04,0x00,0x62,0x67,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00,0xbe,0xbe,0xbe, 0xff,0x0e,0x05,0x06,0x00,0x69,0x63,0x6f,0x6e,0x00,0x65,0x61,0x72,0x74,0x68,0x00,0x03,0x00,0x00,0x00, 0x07,0x13,0x04,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79, -0x70,0x65,0x00,0x0d,0x00,0x00,0x00,0x07,0x0b,0x04,0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f, +0x70,0x65,0x00,0x12,0x00,0x00,0x00,0x07,0x0b,0x04,0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f, 0x72,0x00,0x00,0x00,0xff,0xff,0x0e,0x09,0x0a,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x72, 0x65,0x64,0x5f,0x62,0x74,0x6e,0x5f,0x6e,0x00,0x05,0x00,0x00,0x00,0x07,0x13,0x04,0x00,0x62,0x67,0x5f, -0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x0d,0x00,0x00,0x00, +0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x12,0x00,0x00,0x00, 0x07,0x0b,0x04,0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00,0x00,0x00,0xff,0xff,0x07, 0x09,0x04,0x00,0x78,0x5f,0x6f,0x66,0x66,0x73,0x65,0x74,0x00,0x03,0x00,0x00,0x00,0x07,0x09,0x04,0x00, 0x79,0x5f,0x6f,0x66,0x66,0x73,0x65,0x74,0x00,0x03,0x00,0x00,0x00,0x0e,0x09,0x0a,0x00,0x62,0x67,0x5f, 0x69,0x6d,0x61,0x67,0x65,0x00,0x72,0x65,0x64,0x5f,0x62,0x74,0x6e,0x5f,0x70,0x00,0x03,0x00,0x00,0x00, 0x07,0x13,0x04,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79, -0x70,0x65,0x00,0x0d,0x00,0x00,0x00,0x07,0x0b,0x04,0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f, +0x70,0x65,0x00,0x12,0x00,0x00,0x00,0x07,0x0b,0x04,0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f, 0x72,0x00,0x00,0x00,0xff,0xff,0x0e,0x09,0x0a,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x72, 0x65,0x64,0x5f,0x62,0x74,0x6e,0x5f,0x6f,0x00,0x02,0x00,0x00,0x00,0x07,0x0b,0x04,0x00,0x74,0x65,0x78, 0x74,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00,0x00,0x00,0xff,0xff,0x0e,0x05,0x07,0x00,0x69,0x63,0x6f,0x6e, diff --git a/demos/assets/default/inc/styles/default.data b/demos/assets/default/inc/styles/default.data index 2cfa1e3e0..e61c4d191 100644 --- a/demos/assets/default/inc/styles/default.data +++ b/demos/assets/default/inc/styles/default.data @@ -1615,8 +1615,8 @@ TK_CONST_DATA_ALIGN(const unsigned char style_default[]) = { 0x61,0x67,0x65,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x66,0x67,0x00,0x05,0x00,0x00,0x00,0x07,0x0b, 0x04,0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00,0x00,0x00,0x00,0xff,0x07,0x13,0x04, 0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00, -0x0e,0x00,0x00,0x00,0x07,0x13,0x04,0x00,0x66,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61, -0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x0e,0x00,0x00,0x00,0x0e,0x09,0x0c,0x00,0x62,0x67,0x5f,0x69,0x6d, +0x13,0x00,0x00,0x00,0x07,0x13,0x04,0x00,0x66,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61, +0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x13,0x00,0x00,0x00,0x0e,0x09,0x0c,0x00,0x62,0x67,0x5f,0x69,0x6d, 0x61,0x67,0x65,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x62,0x67,0x00,0x0e,0x09,0x0c,0x00, 0x66,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x66,0x67, 0x00,0x03,0x00,0x00,0x00,0x07,0x09,0x04,0x00,0x62,0x67,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00,0xa0,0xa0, @@ -1655,21 +1655,21 @@ TK_CONST_DATA_ALIGN(const unsigned char style_default[]) = { 0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x66,0x67,0x00,0x0e,0x05,0x0e,0x00,0x69,0x63,0x6f,0x6e,0x00, 0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x64,0x72,0x61,0x67,0x5f,0x6f,0x00,0x05,0x00,0x00,0x00,0x07,0x13, 0x04,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65, -0x00,0x0e,0x00,0x00,0x00,0x07,0x13,0x04,0x00,0x66,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72, -0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x0e,0x00,0x00,0x00,0x0e,0x09,0x0c,0x00,0x62,0x67,0x5f,0x69, +0x00,0x13,0x00,0x00,0x00,0x07,0x13,0x04,0x00,0x66,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72, +0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x13,0x00,0x00,0x00,0x0e,0x09,0x0c,0x00,0x62,0x67,0x5f,0x69, 0x6d,0x61,0x67,0x65,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x62,0x67,0x00,0x0e,0x09,0x0c, 0x00,0x66,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x66, 0x67,0x00,0x0e,0x05,0x0c,0x00,0x69,0x63,0x6f,0x6e,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x64,0x72, 0x61,0x67,0x00,0x05,0x00,0x00,0x00,0x07,0x13,0x04,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f, -0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x0e,0x00,0x00,0x00,0x07,0x13,0x04,0x00,0x66,0x67, -0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x0e,0x00,0x00, +0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x13,0x00,0x00,0x00,0x07,0x13,0x04,0x00,0x66,0x67, +0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x13,0x00,0x00, 0x00,0x0e,0x09,0x0c,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x73,0x6c,0x69,0x64,0x65,0x72, 0x5f,0x76,0x5f,0x62,0x67,0x00,0x0e,0x09,0x0c,0x00,0x66,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x73, 0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x66,0x67,0x00,0x0e,0x05,0x0e,0x00,0x69,0x63,0x6f,0x6e,0x00, 0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x64,0x72,0x61,0x67,0x5f,0x70,0x00,0x05,0x00,0x00,0x00,0x07,0x13, 0x04,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65, -0x00,0x0e,0x00,0x00,0x00,0x07,0x13,0x04,0x00,0x66,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72, -0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x0e,0x00,0x00,0x00,0x0e,0x09,0x0c,0x00,0x62,0x67,0x5f,0x69, +0x00,0x13,0x00,0x00,0x00,0x07,0x13,0x04,0x00,0x66,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72, +0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x13,0x00,0x00,0x00,0x0e,0x09,0x0c,0x00,0x62,0x67,0x5f,0x69, 0x6d,0x61,0x67,0x65,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x62,0x67,0x00,0x0e,0x09,0x0c, 0x00,0x66,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x66, 0x67,0x00,0x0e,0x05,0x0e,0x00,0x69,0x63,0x6f,0x6e,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x64,0x72, diff --git a/demos/assets/default/inc/styles/dialog.data b/demos/assets/default/inc/styles/dialog.data index 9dcc48fd7..783928d10 100644 --- a/demos/assets/default/inc/styles/dialog.data +++ b/demos/assets/default/inc/styles/dialog.data @@ -48,30 +48,30 @@ TK_CONST_DATA_ALIGN(const unsigned char style_dialog[]) = { 0x00,0x00,0x00,0x00,0x64,0x69,0x61,0x6c,0x6f,0x67,0x5f,0x63,0x6c,0x69,0x65,0x6e,0x74,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00, 0x07,0x13,0x04,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79, -0x70,0x65,0x00,0x0d,0x00,0x00,0x00,0x07,0x0b,0x04,0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f, +0x70,0x65,0x00,0x12,0x00,0x00,0x00,0x07,0x0b,0x04,0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f, 0x72,0x00,0x00,0x00,0xff,0xff,0x0e,0x09,0x0c,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x67, 0x72,0x65,0x65,0x6e,0x5f,0x62,0x74,0x6e,0x5f,0x6e,0x00,0x03,0x00,0x00,0x00,0x07,0x13,0x04,0x00,0x62, -0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x0d,0x00, +0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x12,0x00, 0x00,0x00,0x07,0x0b,0x04,0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00,0x00,0x00,0xff, 0xff,0x0e,0x09,0x0c,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x67,0x72,0x65,0x65,0x6e,0x5f, 0x62,0x74,0x6e,0x5f,0x70,0x00,0x03,0x00,0x00,0x00,0x07,0x13,0x04,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61, -0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x0d,0x00,0x00,0x00,0x07,0x0b,0x04, +0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x12,0x00,0x00,0x00,0x07,0x0b,0x04, 0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00,0x00,0x00,0xff,0xff,0x0e,0x09,0x0c,0x00, 0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x67,0x72,0x65,0x65,0x6e,0x5f,0x62,0x74,0x6e,0x5f,0x6f, 0x00,0x03,0x00,0x00,0x00,0x07,0x13,0x04,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72, -0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x0d,0x00,0x00,0x00,0x07,0x0b,0x04,0x00,0x74,0x65,0x78,0x74, +0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x12,0x00,0x00,0x00,0x07,0x0b,0x04,0x00,0x74,0x65,0x78,0x74, 0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00,0x00,0x00,0xff,0xff,0x0e,0x09,0x0a,0x00,0x62,0x67,0x5f,0x69,0x6d, 0x61,0x67,0x65,0x00,0x72,0x65,0x64,0x5f,0x62,0x74,0x6e,0x5f,0x6e,0x00,0x03,0x00,0x00,0x00,0x07,0x13, 0x04,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65, -0x00,0x0d,0x00,0x00,0x00,0x07,0x0b,0x04,0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00, +0x00,0x12,0x00,0x00,0x00,0x07,0x0b,0x04,0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00, 0x00,0x00,0xff,0xff,0x0e,0x09,0x0a,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x72,0x65,0x64, 0x5f,0x62,0x74,0x6e,0x5f,0x70,0x00,0x03,0x00,0x00,0x00,0x07,0x13,0x04,0x00,0x62,0x67,0x5f,0x69,0x6d, -0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x0d,0x00,0x00,0x00,0x07,0x0b, +0x61,0x67,0x65,0x5f,0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x12,0x00,0x00,0x00,0x07,0x0b, 0x04,0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00,0x00,0x00,0xff,0xff,0x0e,0x09,0x0a, 0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x00,0x72,0x65,0x64,0x5f,0x62,0x74,0x6e,0x5f,0x6f,0x00, 0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x07,0x0b,0x04,0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c, 0x6f,0x72,0x00,0x00,0x00,0x00,0xff,0x07,0x13,0x04,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65,0x5f, -0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x0d,0x00,0x00,0x00,0x0e,0x05,0x05,0x00,0x69,0x63, +0x64,0x72,0x61,0x77,0x5f,0x74,0x79,0x70,0x65,0x00,0x12,0x00,0x00,0x00,0x0e,0x05,0x05,0x00,0x69,0x63, 0x6f,0x6e,0x00,0x69,0x6e,0x66,0x6f,0x00,0x0e,0x09,0x0d,0x00,0x62,0x67,0x5f,0x69,0x6d,0x61,0x67,0x65, 0x00,0x64,0x69,0x61,0x6c,0x6f,0x67,0x5f,0x74,0x69,0x74,0x6c,0x65,0x00,0x02,0x00,0x00,0x00,0x07,0x09, 0x04,0x00,0x62,0x67,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00,0xed,0xed,0xed,0xff,0x07,0x0d,0x04,0x00,0x62, diff --git a/demos/assets/default/inc/ui/mledit.data b/demos/assets/default/inc/ui/mledit.data index c06112d4d..8761161ce 100644 --- a/demos/assets/default/inc/ui/mledit.data +++ b/demos/assets/default/inc/ui/mledit.data @@ -1,5 +1,5 @@ TK_CONST_DATA_ALIGN(const unsigned char ui_mledit[]) = { -0x04,0x00,0x01,0x01,0x6a,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0x6c,0x65,0x64,0x69,0x74,0x00,0x64, +0x04,0x00,0x01,0x01,0xe9,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0x6c,0x65,0x64,0x69,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,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, @@ -26,10 +26,16 @@ TK_CONST_DATA_ALIGN(const unsigned char ui_mledit[]) = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0e,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,0x34,0x2c,0x68,0x3d,0x31,0x30,0x30,0x25,0x29,0x00, -0x76,0x61,0x6c,0x75,0x65,0x00,0x30,0x00,0x00,0x00,0x00,0x6d,0x6c,0x65,0x64,0x69,0x74,0x00,0x00,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,0x5a,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x73, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,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,0x2c,0x79,0x3d,0x62,0x3a,0x31,0x30,0x2c,0x77,0x3d,0x39,0x30,0x25,0x2c,0x68,0x3d,0x34,0x30, -0x25,0x29,0x00,0x77,0x72,0x61,0x70,0x5f,0x77,0x6f,0x72,0x64,0x00,0x66,0x61,0x6c,0x73,0x65,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,};/*666*/ +0x3d,0x63,0x2c,0x79,0x3d,0x6d,0x2c,0x77,0x3d,0x31,0x32,0x38,0x2c,0x68,0x3d,0x33,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,0x66,0x6f,0x63,0x75,0x73,0x61,0x62,0x6c,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x00,0x00,0x6d,0x6c, +0x65,0x64,0x69,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5a,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,0x3a,0x31,0x30,0x2c,0x77,0x3d,0x39, +0x30,0x25,0x2c,0x68,0x3d,0x34,0x30,0x25,0x29,0x00,0x77,0x72,0x61,0x70,0x5f,0x77,0x6f,0x72,0x64,0x00, +0x66,0x61,0x6c,0x73,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*793*/ diff --git a/demos/assets/default/raw/styles/button.bin b/demos/assets/default/raw/styles/button.bin index 69a65903e..63b61f94c 100644 Binary files a/demos/assets/default/raw/styles/button.bin and b/demos/assets/default/raw/styles/button.bin differ diff --git a/demos/assets/default/raw/styles/default.bin b/demos/assets/default/raw/styles/default.bin index 0eb1c3bea..a766c9349 100644 Binary files a/demos/assets/default/raw/styles/default.bin and b/demos/assets/default/raw/styles/default.bin differ diff --git a/demos/assets/default/raw/styles/dialog.bin b/demos/assets/default/raw/styles/dialog.bin index db259cf4e..3a61b9ce0 100644 Binary files a/demos/assets/default/raw/styles/dialog.bin and b/demos/assets/default/raw/styles/dialog.bin differ diff --git a/demos/assets/default/raw/ui/mledit.bin b/demos/assets/default/raw/ui/mledit.bin index f2cd5e2ef..70d27c00d 100644 Binary files a/demos/assets/default/raw/ui/mledit.bin and b/demos/assets/default/raw/ui/mledit.bin differ diff --git a/demos/assets/default/raw/ui/mledit.xml b/demos/assets/default/raw/ui/mledit.xml index 8418d2ba3..e66277d3f 100644 --- a/demos/assets/default/raw/ui/mledit.xml +++ b/demos/assets/default/raw/ui/mledit.xml @@ -4,6 +4,7 @@ +