AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-11 00:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Deadlock fix and toolbar shading

Browse Source
This commit is contained in:
Jack Andersen
2015-12-03 15:35:01 -10:00
parent bd0becc9c0
commit f53127290d
11 changed files with 128 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
specter/lib/ViewResources.cpp
View File

@@ -4,27 +4,31 @@ namespace Specter
{
static LogVisor::LogModule Log("Specter::ViewResources");
void ViewResources::init(boo::IGraphicsDataFactory* factory, FontCache* fcache, unsigned dpi)
void ViewResources::init(boo::IGraphicsDataFactory* factory, FontCache* fcache,
const ThemeData& theme, unsigned dpi)
{
m_pixelFactor = dpi / 72.f;
m_theme = theme;
m_factory = factory;
m_fcache = fcache;
m_mainFont = fcache->prepMainFont(factory, AllCharFilter, false, 10.f, dpi);
m_monoFont = fcache->prepMonoFont(factory, AllCharFilter, false, 10.f, dpi);
m_heading14 = fcache->prepMainFont(factory, LatinAndJapaneseCharFilter, false, 14.f, dpi);
m_heading18 = fcache->prepMainFont(factory, LatinAndJapaneseCharFilter, false, 18.f, dpi);
m_fontData.reset(factory->commit());
switch (factory->platform())
{
case boo::IGraphicsDataFactory::Platform::OGL:
init<boo::GLDataFactory>(static_cast<boo::GLDataFactory*>(factory), fcache);
init<boo::GLDataFactory>(static_cast<boo::GLDataFactory*>(factory), fcache, theme);
break;
#if _WIN32
case boo::IGraphicsDataFactory::Platform::D3D11:
case boo::IGraphicsDataFactory::Platform::D3D12:
init<boo::ID3DDataFactory>(static_cast<boo::ID3DDataFactory*>(factory), fcache);
init<boo::ID3DDataFactory>(static_cast<boo::ID3DDataFactory*>(factory), fcache, theme);
break;
#elif BOO_HAS_METAL
case boo::IGraphicsDataFactory::Platform::Metal:
init<boo::MetalDataFactory>(static_cast<boo::MetalDataFactory*>(factory), fcache);
init<boo::MetalDataFactory>(static_cast<boo::MetalDataFactory*>(factory), fcache, theme);
break;
#endif
default:
@@ -34,4 +38,20 @@ void ViewResources::init(boo::IGraphicsDataFactory* factory, FontCache* fcache,
m_resData.reset(factory->commit());
}
void ViewResources::resetDPI(unsigned dpi)
{
m_pixelFactor = dpi / 72.f;
m_mainFont = m_fcache->prepMainFont(m_factory, AllCharFilter, false, 10.f, dpi);
m_monoFont = m_fcache->prepMonoFont(m_factory, AllCharFilter, false, 10.f, dpi);
m_heading14 = m_fcache->prepMainFont(m_factory, LatinAndJapaneseCharFilter, false, 14.f, dpi);
m_heading18 = m_fcache->prepMainFont(m_factory, LatinAndJapaneseCharFilter, false, 18.f, dpi);
m_fontData.reset(m_factory->commit());
m_fcache->closeBuiltinFonts();
}
void ViewResources::resetTheme(const ThemeData& theme)
{
m_theme = theme;
}
}