test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-12-02 03:58:33 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

rename dumbledor.ttf to default_mini.ttf

Browse Source
This commit is contained in:
xianjimli 2019-04-02 14:51:04 +08:00
parent 7e27625e61
commit 9bfd1e75a9
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demos/assets.c
View File

@ -369,20 +369,20 @@
#include "assets/inc/images/arrow_left_n.data" #include "assets/inc/images/arrow_left_n.data"
#include "assets/inc/images/edit_clear_p.data" #include "assets/inc/images/edit_clear_p.data"
#include "assets/inc/images/battery_2.data" #include "assets/inc/images/battery_2.data"
#endif/*WITH_STB_IMAGE*/ #endif /*WITH_STB_IMAGE*/
#ifdef WITH_VGCANVAS #ifdef WITH_VGCANVAS
#include "assets/inc/images/pointer_4.bsvg" #include "assets/inc/images/pointer_4.bsvg"
#include "assets/inc/images/china.bsvg" #include "assets/inc/images/china.bsvg"
#include "assets/inc/images/pointer_1.bsvg" #include "assets/inc/images/pointer_1.bsvg"
#include "assets/inc/images/pointer.bsvg" #include "assets/inc/images/pointer.bsvg"
#include "assets/inc/images/girl.bsvg" #include "assets/inc/images/girl.bsvg"
#endif/*WITH_VGCANVAS*/ #endif /*WITH_VGCANVAS*/
#if defined(WITH_STB_FONT) || defined(WITH_FT_FONT) #if defined(WITH_STB_FONT) || defined(WITH_FT_FONT)
#include "assets/inc/fonts/default.res" #include "assets/inc/fonts/default.res"
#else/*WITH_STB_FONT or WITH_FT_FONT*/ #else /*WITH_STB_FONT or WITH_FT_FONT*/
#include "assets/inc/fonts/default.data" #include "assets/inc/fonts/default.data"
#endif/*WITH_STB_FONT or WITH_FT_FONT*/ #endif /*WITH_STB_FONT or WITH_FT_FONT*/
#endif/*WITH_FS_RES*/ #endif /*WITH_FS_RES*/
ret_t assets_init(void) { ret_t assets_init(void) {
assets_manager_t* rm = assets_manager(); assets_manager_t* rm = assets_manager();
@ -643,7 +643,7 @@ ret_t assets_init(void) {
assets_manager_add(rm, image_pointer_1); assets_manager_add(rm, image_pointer_1);
assets_manager_add(rm, image_pointer); assets_manager_add(rm, image_pointer);
assets_manager_add(rm, image_girl); assets_manager_add(rm, image_girl);
#endif/*WITH_VGCANVAS*/ #endif /*WITH_VGCANVAS*/
#endif #endif
tk_init_assets(); tk_init_assets();

6
demos/assets/inc/fonts/dumbledor.res → demos/assets/inc/fonts/default_mini.res
View File

@ -1,6 +1,6 @@
const unsigned char font_dumbledor[] = { const unsigned char font_default_mini[] = {
0x01,0x00,0x01,0x01,0xc4,0xec,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x75,0x6d,0x62,0x6c,0x65,0x64,0x6f, 0x01,0x00,0x01,0x01,0xc4,0xec,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x5f,
0x72,0x00,0x72,0x65,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x6d,0x69,0x6e,0x69,0x00,0x72,0x65,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0f,0x00,0x30,0x00,0x03,0x00,0xc0,0x4f,0x53,0x2f,0x32, 0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0f,0x00,0x30,0x00,0x03,0x00,0xc0,0x4f,0x53,0x2f,0x32,
0x66,0xd8,0x7f,0x24,0x00,0x00,0xeb,0xb8,0x00,0x00,0x00,0x56,0x50,0x43,0x4c,0x54,0x76,0x58,0xd5,0x85, 0x66,0xd8,0x7f,0x24,0x00,0x00,0xeb,0xb8,0x00,0x00,0x00,0x56,0x50,0x43,0x4c,0x54,0x76,0x58,0xd5,0x85,
0x00,0x00,0xec,0x10,0x00,0x00,0x00,0x36,0x63,0x6d,0x61,0x70,0xf2,0xa0,0xf8,0xd8,0x00,0x00,0xd7,0x58, 0x00,0x00,0xec,0x10,0x00,0x00,0x00,0x36,0x63,0x6d,0x61,0x70,0xf2,0xa0,0xf8,0xd8,0x00,0x00,0xd7,0x58,

0
demos/assets/raw/fonts/dumbledor.ttf → demos/assets/raw/fonts/default_mini.ttf
View File

6
src/base/types_def.h
View File

@ -217,15 +217,15 @@ typedef enum _app_type_t {
#ifndef TK_DEFAULT_FONT #ifndef TK_DEFAULT_FONT
#define TK_DEFAULT_FONT "default" #define TK_DEFAULT_FONT "default"
#endif/*TK_DEFAULT_FONT*/ #endif /*TK_DEFAULT_FONT*/
#ifndef TK_DEFAULT_FONT_SIZE #ifndef TK_DEFAULT_FONT_SIZE
#define TK_DEFAULT_FONT_SIZE 18 #define TK_DEFAULT_FONT_SIZE 18
#endif/*TK_DEFAULT_FONT_SIZE*/ #endif /*TK_DEFAULT_FONT_SIZE*/
#ifndef TK_MAX_FPS #ifndef TK_MAX_FPS
#define TK_MAX_FPS 100 #define TK_MAX_FPS 100
#endif/*TK_MAX_FPS*/ #endif /*TK_MAX_FPS*/
#define TK_OPACITY_ALPHA 0xfa #define TK_OPACITY_ALPHA 0xfa
#define TK_TRANSPARENT_ALPHA 0x02 #define TK_TRANSPARENT_ALPHA 0x02