imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-30 05:05:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Font customization not unlocking correctly

Browse Source
This commit is contained in:
WerWolv
2025-01-18 16:05:11 +01:00
parent 6d3ff64894
commit 3adc2c44e6
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/builtin/source/content/settings_entries.cpp
View File

@@ -671,18 +671,17 @@ namespace hex::plugin::builtin {
customFont = true;
}
bool pixelPerfectFontSelected = false;
if (ImGui::BeginCombo(name.c_str(), pathPreview.c_str())) {
if (ImGui::Selectable("Pixel-Perfect Default Font (Proggy Clean)", m_path.empty() && pixelPerfectFont)) {
m_path.clear();
changed = true;
ContentRegistry::Settings::write<bool>("hex.builtin.setting.font", "hex.builtin.setting.font.pixel_perfect_default_font", true);
pixelPerfectFontSelected = true;
}
if (ImGui::Selectable("Smooth Default Font (JetbrainsMono)", m_path.empty() && !pixelPerfectFont)) {
m_path.clear();
changed = true;
ContentRegistry::Settings::write<bool>("hex.builtin.setting.font", "hex.builtin.setting.font.pixel_perfect_default_font", false);
}
if (ImGui::Selectable("Custom Font", customFont)) {
@@ -701,8 +700,19 @@ namespace hex::plugin::builtin {
ImGui::EndCombo();
}
if (changed) {
m_pixelPerfectFont = pixelPerfectFontSelected;
}
return changed;
}
bool isPixelPerfectFontSelected() const {
return m_pixelPerfectFont;
}
private:
bool m_pixelPerfectFont = false;
};
class SliderPoints : public ContentRegistry::Settings::Widgets::SliderFloat {
@@ -929,7 +939,12 @@ namespace hex::plugin::builtin {
auto customFontPathSetting = ContentRegistry::Settings::add<FontFilePicker>("hex.builtin.setting.font", "hex.builtin.setting.font.custom_font", "hex.builtin.setting.font.font_path")
.requiresRestart()
.setChangedCallback(scaleWarningHandler)
.setChangedCallback([scaleWarningHandler](Widgets::Widget &widget) {
scaleWarningHandler(widget);
auto &fontPicker = static_cast<FontFilePicker&>(widget);
ContentRegistry::Settings::write<bool>("hex.builtin.setting.font", "hex.builtin.setting.font.pixel_perfect_default_font", fontPicker.isPixelPerfectFontSelected());
})
.setEnabledCallback(customFontsEnabled);
const auto customFontSettingsEnabled = [customFontEnabledSetting, customFontPathSetting] {