diff options
| author | bernard.xiong <[email protected]> | 2010-02-08 14:15:11 +0000 |
|---|---|---|
| committer | bernard.xiong <[email protected]> | 2010-02-08 14:15:11 +0000 |
| commit | 6bfc1cb51b322f29b4925f6b22e9840368caaf31 (patch) | |
| tree | 7b7df523bed13583387c877215c2d360fd34561b /rtgui | |
| parent | 8dabef70db5f4bf5160b19e1dec656a2f2fc5839 (diff) | |
move the default font option to bsp.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@393 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'rtgui')
| -rw-r--r-- | rtgui/common/rtgui_theme.c | 10 | ||||
| -rw-r--r-- | rtgui/include/rtgui/rtgui_config.h | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/rtgui/common/rtgui_theme.c b/rtgui/common/rtgui_theme.c index 0609ecdd27..4f5ea3eb02 100644 --- a/rtgui/common/rtgui_theme.c +++ b/rtgui/common/rtgui_theme.c @@ -37,8 +37,14 @@ extern struct rtgui_font rtgui_font_arial12; /* init theme */ void rtgui_system_theme_init() -{ - rtgui_font_set_defaut(&rtgui_font_asc12); +{
+#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 } static const rt_uint8_t close_byte[14] = {0x06, 0x18, 0x03, 0x30, 0x01, 0xE0, 0x00,
diff --git a/rtgui/include/rtgui/rtgui_config.h b/rtgui/include/rtgui/rtgui_config.h index c8c51c9857..311007d71e 100644 --- a/rtgui/include/rtgui/rtgui_config.h +++ b/rtgui/include/rtgui/rtgui_config.h @@ -27,6 +27,10 @@ #define RTGUI_MEM_TRACE
#endif
+#if RTGUI_DEFAULT_FONT_SIZE == 0
+#define RTGUI_DEFAULT_FONT_SIZE 12
+#endif
+
#define RTGUI_SVR_THREAD_PRIORITY 15
#define RTGUI_SVR_THREAD_TIMESLICE 5
#ifdef RTGUI_USING_SMALL_SIZE
|