nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-09-19 22:59:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fatal: Add font scaling support

Browse source
This commit is contained in:
Michael Scire 2018-11-13 14:32:50 -08:00
parent 1bface09d5
commit f16423c413
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
stratosphere/fatal/source/fatal_font.cpp
View file

@ -31,6 +31,7 @@
static u16 *g_fb = nullptr; static u16 *g_fb = nullptr;
static u32 (*g_unswizzle_func)(u32, u32) = nullptr; static u32 (*g_unswizzle_func)(u32, u32) = nullptr;
static u16 g_font_color = 0xFFFF; static u16 g_font_color = 0xFFFF;
static float g_font_sz = 16.0f;
static u32 g_cur_x = 0, g_cur_y = 0; static u32 g_cur_x = 0, g_cur_y = 0;
static PlFontData g_font; static PlFontData g_font;
@ -132,6 +133,11 @@ void FontManager::SetPosition(u32 x, u32 y) {
g_cur_y = y; g_cur_y = y;
} }
void FontManager::SetFontSize(float fsz) {
g_font_sz = fsz;
g_ft_err = FT_Set_Char_Size(g_face, 0, static_cast<u32>(g_font_sz * 64.0f), 96, 96);
}
void FontManager::AddSpacingLines(float num_lines) { void FontManager::AddSpacingLines(float num_lines) {
g_cur_y += static_cast<u32>((static_cast<float>(g_face->size->metrics.height) * num_lines) / 64.0f); g_cur_y += static_cast<u32>((static_cast<float>(g_face->size->metrics.height) * num_lines) / 64.0f);
} }
@ -159,6 +165,6 @@ Result FontManager::InitializeSharedFont() {
g_ft_err = FT_New_Memory_Face(g_library, reinterpret_cast<const FT_Byte *>(g_font.address), g_font.size, 0, &g_face); g_ft_err = FT_New_Memory_Face(g_library, reinterpret_cast<const FT_Byte *>(g_font.address), g_font.size, 0, &g_face);
if (g_ft_err) return g_ft_err; if (g_ft_err) return g_ft_err;
g_ft_err = FT_Set_Char_Size(g_face, 0, 8*64, 300, 300); g_ft_err = FT_Set_Char_Size(g_face, 0, static_cast<u32>(g_font_sz * 64.0f), 96, 96);
return g_ft_err; return g_ft_err;
} }

1
stratosphere/fatal/source/fatal_font.hpp
View file

@ -31,6 +31,7 @@ class FontManager {
static void SetFontColor(u16 color); static void SetFontColor(u16 color);
static void SetPosition(u32 x, u32 y); static void SetPosition(u32 x, u32 y);
static void SetFontSize(float fsz);
static void AddSpacingLines(float num_lines); static void AddSpacingLines(float num_lines);
static void PrintLine(const char *str); static void PrintLine(const char *str);
static void PrintFormatLine(const char *format, ...); static void PrintFormatLine(const char *format, ...);

2
stratosphere/fatal/source/fatal_task_screen.cpp
View file

@ -207,7 +207,7 @@ Result ShowFatalTask::ShowFatal() {
FontManager::PrintFormatLine(u8"Firmware: %s (Atmosphère %u.%u.%u-%s)", GetFatalConfig()->firmware_version.display_version, FontManager::PrintFormatLine(u8"Firmware: %s (Atmosphère %u.%u.%u-%s)", GetFatalConfig()->firmware_version.display_version,
CURRENT_ATMOSPHERE_VERSION, GetAtmosphereGitRevision()); CURRENT_ATMOSPHERE_VERSION, GetAtmosphereGitRevision());
/* Enqueue the buffer. */ /* Enqueue the buffer. */
framebufferEnd(&fb); framebufferEnd(&fb);