AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add 18pt mono font

This commit is contained in:
Phillip Stephens 2018-05-13 20:37:01 -07:00
parent 019ab942e7
commit 70bce7ba2e
2 changed files with 97 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
specter/include/specter/ViewResources.hpp
View File

@ -169,7 +169,8 @@ public:
Button::Resources m_buttonRes;
specter::FontTag m_mainFont;
specter::FontTag m_monoFont;
specter::FontTag m_monoFont10;
specter::FontTag m_monoFont18;
specter::FontTag m_heading14;
specter::FontTag m_heading18;
@ -216,6 +217,6 @@ public:
const IThemeData* m_theme;
const IThemeData& themeData() const { return *m_theme; }
};
}
} // namespace specter
#endif // SPECTER_VIEWRESOURCES_HPP

42
specter/lib/ViewResources.cpp
View File

@ -4,8 +4,7 @@ namespace specter
{
static logvisor::Module Log("specter::ViewResources");
void ViewResources::init(boo::IGraphicsDataFactory* factory, FontCache* fcache,
const IThemeData* theme, float pf)
void ViewResources::init(boo::IGraphicsDataFactory* factory, FontCache* fcache, const IThemeData* theme, float pf)
{
if (!factory || !fcache || !theme)
Log.report(logvisor::Fatal, "all arguments of ViewResources::init() must be non-null");
@ -17,9 +16,7 @@ void ViewResources::init(boo::IGraphicsDataFactory* factory, FontCache* fcache,
m_curveFont = fcache->prepCurvesFont(AllCharFilter, false, 8.f, dpi);
factory->commitTransaction(
[&](boo::IGraphicsDataFactory::Context& ctx) -> bool
{
factory->commitTransaction([&](boo::IGraphicsDataFactory::Context& ctx) -> bool {
switch (ctx.platform())
{
#if BOO_HAS_GL
@ -62,17 +59,26 @@ void ViewResources::destroyResData()
void ViewResources::prepFontCacheSync()
{
unsigned dpi = 72.f * m_pixelFactor;
if (m_fcacheInterrupt) return;
if (m_fcacheInterrupt)
return;
m_mainFont = m_fcache->prepMainFont(AllCharFilter, false, 10.f, dpi);
if (m_fcacheInterrupt) return;
m_monoFont = m_fcache->prepMonoFont(AllCharFilter, false, 10.f, dpi);
if (m_fcacheInterrupt) return;
if (m_fcacheInterrupt)
return;
m_monoFont10 = m_fcache->prepMonoFont(AllCharFilter, false, 10.f, dpi);
if (m_fcacheInterrupt)
return;
m_monoFont18 = m_fcache->prepMonoFont(AllCharFilter, false, 18.f, dpi);
if (m_fcacheInterrupt)
return;
m_heading14 = m_fcache->prepMainFont(LatinAndJapaneseCharFilter, false, 14.f, dpi);
if (m_fcacheInterrupt) return;
if (m_fcacheInterrupt)
return;
m_heading18 = m_fcache->prepMainFont(LatinAndJapaneseCharFilter, false, 18.f, dpi);
if (m_fcacheInterrupt) return;
if (m_fcacheInterrupt)
return;
m_titleFont = m_fcache->prepMainFont(LatinCharFilter, false, 36.f, dpi);
if (m_fcacheInterrupt) return;
if (m_fcacheInterrupt)
return;
m_fcache->closeBuiltinFonts();
m_fcacheReady = true;
}
@ -80,10 +86,7 @@ void ViewResources::prepFontCacheSync()
void ViewResources::prepFontCacheAsync(boo::IWindow* window)
{
m_fcacheReady = false;
m_fcacheThread = std::thread([this, window]()
{
prepFontCacheSync();
});
m_fcacheThread = std::thread([this, window]() { prepFontCacheSync(); });
}
void ViewResources::resetPixelFactor(float pf)
@ -94,9 +97,6 @@ void ViewResources::resetPixelFactor(float pf)
prepFontCacheSync();
}
void ViewResources::resetTheme(const IThemeData* theme)
{
m_theme = theme;
}
void ViewResources::resetTheme(const IThemeData* theme) { m_theme = theme; }
}
} // namespace specter