mirror of
https://github.com/ciphervance/supercell-wx.git
synced 2025-10-30 17:00:05 +00:00
Use fonts defined by text settings for rendering
This commit is contained in:
parent
e37e64b3f2
commit
11ea4676cf
5 changed files with 47 additions and 79 deletions
|
|
@ -1,10 +1,7 @@
|
|||
#include <scwx/qt/util/imgui.hpp>
|
||||
#include <scwx/qt/manager/resource_manager.hpp>
|
||||
#include <scwx/qt/settings/general_settings.hpp>
|
||||
#include <scwx/qt/manager/font_manager.hpp>
|
||||
#include <scwx/util/logger.hpp>
|
||||
|
||||
#include <mutex>
|
||||
|
||||
#include <imgui.h>
|
||||
|
||||
namespace scwx
|
||||
|
|
@ -22,13 +19,6 @@ class ImGui::Impl
|
|||
public:
|
||||
explicit Impl() {}
|
||||
~Impl() {}
|
||||
|
||||
void Initialize();
|
||||
void UpdateMonospaceFont();
|
||||
|
||||
bool initialized_ {false};
|
||||
|
||||
ImFont* monospaceFont_ {nullptr};
|
||||
};
|
||||
|
||||
ImGui::ImGui() : p(std::make_unique<Impl>()) {}
|
||||
|
|
@ -37,58 +27,13 @@ ImGui::~ImGui() = default;
|
|||
ImGui::ImGui(ImGui&&) noexcept = default;
|
||||
ImGui& ImGui::operator=(ImGui&&) noexcept = default;
|
||||
|
||||
void ImGui::Impl::Initialize()
|
||||
{
|
||||
if (initialized_)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
logger_->debug("Initialize");
|
||||
|
||||
// Configure monospace font
|
||||
UpdateMonospaceFont();
|
||||
settings::GeneralSettings::Instance()
|
||||
.font_sizes()
|
||||
.RegisterValueChangedCallback([this](const std::vector<std::int64_t>&)
|
||||
{ UpdateMonospaceFont(); });
|
||||
|
||||
initialized_ = true;
|
||||
}
|
||||
|
||||
void ImGui::Impl::UpdateMonospaceFont()
|
||||
{
|
||||
// Get monospace font size
|
||||
std::size_t fontSize = 16;
|
||||
auto fontSizes =
|
||||
settings::GeneralSettings::Instance().font_sizes().GetValue();
|
||||
if (fontSizes.size() > 1)
|
||||
{
|
||||
fontSize = fontSizes[1];
|
||||
}
|
||||
else if (fontSizes.size() > 0)
|
||||
{
|
||||
fontSize = fontSizes[0];
|
||||
}
|
||||
|
||||
// Get monospace font pointer
|
||||
auto monospace =
|
||||
manager::ResourceManager::Font(types::Font::Inconsolata_Regular);
|
||||
auto monospaceFont = monospace->ImGuiFont(fontSize);
|
||||
|
||||
// Store monospace font pointer if not null
|
||||
if (monospaceFont != nullptr)
|
||||
{
|
||||
monospaceFont_ = monospace->ImGuiFont(fontSize);
|
||||
}
|
||||
}
|
||||
|
||||
void ImGui::DrawTooltip(const std::string& hoverText)
|
||||
{
|
||||
p->Initialize();
|
||||
auto tooltipFont = manager::FontManager::Instance().GetImGuiFont(
|
||||
types::FontCategory::Tooltip);
|
||||
|
||||
::ImGui::BeginTooltip();
|
||||
::ImGui::PushFont(p->monospaceFont_);
|
||||
::ImGui::PushFont(tooltipFont->font());
|
||||
::ImGui::TextUnformatted(hoverText.c_str());
|
||||
::ImGui::PopFont();
|
||||
::ImGui::EndTooltip();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue