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

impr: Use icon buttons for bold and italic font settings

Browse Source
This commit is contained in:
WerWolv
2025-08-05 23:32:44 +02:00
parent 263c5f6830
commit 018c61890c
2 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/fonts/include/font_settings.hpp
View File

@@ -68,14 +68,12 @@ namespace hex::fonts {
[[nodiscard]] bool isItalic() const;
[[nodiscard]] AntialiasingType getAntialiasingType() const;
private:
bool drawPopup();
private:
FontFilePicker m_fontFilePicker;
SliderPoints m_fontSize;
AntialiasPicker m_antiAliased;
ContentRegistry::Settings::Widgets::Checkbox m_bold, m_italic;
bool m_bold, m_italic;
bool m_applyEnabled = false;
};

61
plugins/fonts/source/font_settings.cpp
View File

@@ -6,6 +6,7 @@
#include <imgui.h>
#include <fonts/fonts.hpp>
#include <fonts/vscode_icons.hpp>
#include <hex/api/task_manager.hpp>
#include <hex/ui/imgui_imhex_extensions.h>
#include <romfs/romfs.hpp>
@@ -223,10 +224,21 @@ namespace hex::fonts {
ImGui::BeginDisabled(m_fontFilePicker.isPixelPerfectFontSelected());
{
if (m_fontSize.draw("hex.fonts.setting.font.font_size"_lang)) changed = true;
if (m_bold.draw("hex.fonts.setting.font.font_bold"_lang)) changed = true;
if (m_italic.draw("hex.fonts.setting.font.font_italic"_lang)) changed = true;
if (m_antiAliased.draw("hex.fonts.setting.font.font_antialias"_lang)) changed = true;
if (m_fontSize.draw("hex.fonts.setting.font.font_size"_lang))
changed = true;
if (ImGuiExt::DimmedIconToggle(ICON_VS_BOLD, &m_bold))
changed = true;
ImGui::SetItemTooltip("hex.fonts.setting.font.font_bold"_lang);
ImGui::SameLine();
if (ImGuiExt::DimmedIconToggle(ICON_VS_ITALIC, &m_italic))
changed = true;
ImGui::SetItemTooltip("hex.fonts.setting.font.font_italic"_lang);
if (m_antiAliased.draw("hex.fonts.setting.font.font_antialias"_lang))
changed = true;
}
ImGui::EndDisabled();
@@ -242,8 +254,8 @@ namespace hex::fonts {
json["font_file"] = m_fontFilePicker.store();
json["font_size"] = m_fontSize.store();
json["bold"] = m_bold.store();
json["italic"] = m_italic.store();
json["bold"] = m_bold;
json["italic"] = m_italic;
json["antialiased"] = m_antiAliased.store();
return json;
@@ -251,40 +263,11 @@ namespace hex::fonts {
void FontSelector::load(const nlohmann::json& data) {
m_fontFilePicker.load(data["font_file"]);
m_fontSize.load(data["font_size"]);
m_bold.load(data["bold"]);
m_italic.load(data["italic"]);
m_bold = data["bold"];
m_italic = data["italic"];
m_antiAliased.load(data["antialiased"]);
}
bool FontSelector::drawPopup() {
bool changed = false;
if (ImGui::BeginPopup("Fonts")) {
if (m_fontFilePicker.draw("hex.fonts.setting.font.custom_font"_lang)) m_applyEnabled = true;
ImGui::BeginDisabled(m_fontFilePicker.isPixelPerfectFontSelected());
{
if (m_fontSize.draw("hex.fonts.setting.font.font_size"_lang)) m_applyEnabled = true;
if (m_bold.draw("hex.fonts.setting.font.font_bold"_lang)) m_applyEnabled = true;
if (m_italic.draw("hex.fonts.setting.font.font_italic"_lang)) m_applyEnabled = true;
if (m_antiAliased.draw("hex.fonts.setting.font.font_antialias"_lang)) m_applyEnabled = true;
}
ImGui::EndDisabled();
ImGui::NewLine();
ImGui::BeginDisabled(!m_applyEnabled);
if (ImGui::Button("hex.ui.common.apply"_lang)) {
changed = true;
m_applyEnabled = false;
}
ImGui::EndDisabled();
ImGui::EndPopup();
}
return changed;
}
[[nodiscard]] const std::fs::path& FontSelector::getFontPath() const {
return m_fontFilePicker.getPath();
}
@@ -298,11 +281,11 @@ namespace hex::fonts {
}
[[nodiscard]] bool FontSelector::isBold() const {
return m_bold.isChecked();
return m_bold;
}
[[nodiscard]] bool FontSelector::isItalic() const {
return m_italic.isChecked();
return m_italic;
}
[[nodiscard]] AntialiasingType FontSelector::getAntialiasingType() const {