libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[UI Engine] fix the default font initialization issue.

This commit is contained in:
Bernard Xiong 2016-03-23 23:03:45 +08:00
parent e41c6c6c0c
commit 640e5c9777
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/gui/src/rtgui_system.c
View File

@ -10,6 +10,7 @@
* Change Logs: * Change Logs:
* Date Author Notes * Date Author Notes
* 2009-10-04 Bernard first version * 2009-10-04 Bernard first version
* 2016-03-23 Bernard fix the default font initialization issue.
*/ */
#include <rtgui/rtgui.h> #include <rtgui/rtgui.h>
@ -20,7 +21,6 @@
#include <rtgui/rtgui_server.h> #include <rtgui/rtgui_server.h>
#include <rtgui/rtgui_system.h> #include <rtgui/rtgui_system.h>
#include <rtgui/widgets/window.h> #include <rtgui/widgets/window.h>
//#include <rtgui/rtgui_theme.h>
#ifdef _WIN32_NATIVE #ifdef _WIN32_NATIVE
#define RTGUI_MEM_TRACE #define RTGUI_MEM_TRACE
@ -39,14 +39,6 @@ int rtgui_system_server_init(void)
{ {
rt_mutex_init(&_screen_lock, "screen", RT_IPC_FLAG_FIFO); rt_mutex_init(&_screen_lock, "screen", RT_IPC_FLAG_FIFO);
#if RTGUI_DEFAULT_FONT_SIZE == 16
rtgui_font_set_defaut(&rtgui_font_asc16);
#elif RTGUI_DEFAULT_FONT_SIZE == 12
rtgui_font_set_defaut(&rtgui_font_asc12);
#else
rtgui_font_set_defaut(&rtgui_font_asc12);
#endif
/* init image */ /* init image */
rtgui_system_image_init(); rtgui_system_image_init();
/* init font */ /* init font */
@ -59,8 +51,15 @@ int rtgui_system_server_init(void)
/* use driver rect for main window */ /* use driver rect for main window */
rtgui_graphic_driver_get_rect(rtgui_graphic_driver_get_default(), &_mainwin_rect); rtgui_graphic_driver_get_rect(rtgui_graphic_driver_get_default(), &_mainwin_rect);
/* init theme */ /* set the default font */
// rtgui_system_theme_init(); #if RTGUI_DEFAULT_FONT_SIZE == 16
rtgui_font_set_defaut(&rtgui_font_asc16);
#elif RTGUI_DEFAULT_FONT_SIZE == 12
rtgui_font_set_defaut(&rtgui_font_asc12);
#else
rtgui_font_set_defaut(&rtgui_font_asc12);
#endif
return 0; return 0;
} }
INIT_APP_EXPORT(rtgui_system_server_init); INIT_APP_EXPORT(rtgui_system_server_init);