|
|
@@ -48,14 +48,14 @@ void rtgui_font_system_init()
|
|
|
#ifdef GUIENGINE_USING_FONT16
|
|
|
rtgui_font_system_add_font(&rtgui_font_asc16);
|
|
|
#ifdef GUIENGINE_USING_FONTHZ
|
|
|
- rtgui_font_system_add_font(&rtgui_font_hz16);
|
|
|
+ //rtgui_font_system_add_font(&rtgui_font_hz16);
|
|
|
#endif
|
|
|
#endif
|
|
|
|
|
|
#ifdef GUIENGINE_USING_FONT12
|
|
|
rtgui_font_system_add_font(&rtgui_font_asc12);
|
|
|
#ifdef GUIENGINE_USING_FONTHZ
|
|
|
- rtgui_font_system_add_font(&rtgui_font_hz12);
|
|
|
+ //rtgui_font_system_add_font(&rtgui_font_hz12);
|
|
|
#endif
|
|
|
#endif
|
|
|
}
|
|
|
@@ -109,16 +109,6 @@ struct rtgui_font *rtgui_font_refer(const char *family, rt_uint16_t height)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- rtgui_list_foreach(node, &_rtgui_font_list)
|
|
|
- {
|
|
|
- font = rtgui_list_entry(node, struct rtgui_font, list);
|
|
|
- if (rt_strncmp(font->family, family, GUIENGINE_NAME_MAX) == 0)
|
|
|
- {
|
|
|
- font->refer_count ++;
|
|
|
- return font;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
return RT_NULL;
|
|
|
}
|
|
|
RTM_EXPORT(rtgui_font_refer);
|