scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor font loading: remove redundant icon and Japanese font configurations, and introduce FontState structure for better font management

Browse Source
This commit is contained in:
scawful
2025-02-10 11:47:23 -05:00
parent e8659e9fde
commit c7608a8c0f
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/core/platform/font_loader.cc
View File

@@ -98,21 +98,6 @@ absl::Status AddJapaneseFont() {
absl::Status LoadPackageFonts() { absl::Status LoadPackageFonts() {
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
// Icon configuration
static const ImWchar icons_ranges[] = {ICON_MIN_MD, 0xf900, 0};
ImFontConfig icons_config;
icons_config.MergeMode = true;
icons_config.GlyphOffset.y = 5.0f;
icons_config.GlyphMinAdvanceX = 13.0f;
icons_config.PixelSnapH = true;
// Japanese font configuration
ImFontConfig japanese_font_config;
japanese_font_config.MergeMode = true;
icons_config.GlyphOffset.y = 5.0f;
icons_config.GlyphMinAdvanceX = 13.0f;
icons_config.PixelSnapH = true;
// List of fonts to be loaded // List of fonts to be loaded
std::vector<const char*> font_paths = { std::vector<const char*> font_paths = {
KARLA_REGULAR, ROBOTO_MEDIUM, COUSINE_REGULAR, IBM_PLEX_JP, DROID_SANS}; KARLA_REGULAR, ROBOTO_MEDIUM, COUSINE_REGULAR, IBM_PLEX_JP, DROID_SANS};

12
src/app/core/platform/font_loader.h
View File

@@ -1,16 +1,28 @@
#ifndef YAZE_APP_CORE_PLATFORM_FONTLOADER_H #ifndef YAZE_APP_CORE_PLATFORM_FONTLOADER_H
#define YAZE_APP_CORE_PLATFORM_FONTLOADER_H #define YAZE_APP_CORE_PLATFORM_FONTLOADER_H
#include <vector>
#include "absl/status/status.h" #include "absl/status/status.h"
#include "imgui/imgui.h"
namespace yaze { namespace yaze {
namespace core { namespace core {
struct FontConfig { struct FontConfig {
const char* font_path; const char* font_path;
float font_size; float font_size;
ImFontConfig im_font_config;
ImFontConfig jp_conf_config;
}; };
struct FontState {
std::vector<FontConfig> fonts;
};
static FontState global_font_state;
absl::Status LoadPackageFonts(); absl::Status LoadPackageFonts();
absl::Status ReloadPackageFont(const FontConfig& config); absl::Status ReloadPackageFont(const FontConfig& config);