Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: Fixed some more macOS scaling issues

This commit is contained in:
WerWolv 2022-11-08 18:09:48 +01:00
parent 5bbc2fd94c
commit 23ce2ec271
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/source/init/splash_window.cpp
View File

@ -200,8 +200,12 @@ namespace hex::init {
glfwGetWindowContentScale(this->m_window, &xScale, &yScale); glfwGetWindowContentScale(this->m_window, &xScale, &yScale);
auto meanScale = std::midpoint(xScale, yScale); auto meanScale = std::midpoint(xScale, yScale);
if (meanScale <= 0.0) if (meanScale <= 0.0F)
meanScale = 1.0; meanScale = 1.0F;
#if defined(OS_MACOS)
meanScale /= 2.0F;
#endif
ImHexApi::System::impl::setGlobalScale(meanScale); ImHexApi::System::impl::setGlobalScale(meanScale);
ImHexApi::System::impl::setNativeScale(meanScale); ImHexApi::System::impl::setNativeScale(meanScale);

24
main/source/init/tasks.cpp
View File

@ -83,8 +83,15 @@ namespace hex::init {
} }
bool loadFonts() { bool loadFonts() {
const auto scale = ImHexApi::System::getNativeScale();
float fontSize = ImHexApi::System::getFontSize();
const auto &fontFile = ImHexApi::System::getCustomFontPath();
auto fonts = IM_NEW(ImFontAtlas)(); auto fonts = IM_NEW(ImFontAtlas)();
ImFontConfig cfg = {}; ImFontConfig cfg = {};
cfg.OversampleH = cfg.OversampleV = 1, cfg.PixelSnapH = true;
cfg.SizePixels = fontSize * scale;
ImVector<ImWchar> ranges; ImVector<ImWchar> ranges;
{ {
@ -111,33 +118,24 @@ namespace hex::init {
0x0100, 0xFFF0, 0 0x0100, 0xFFF0, 0
}; };
const auto &fontFile = ImHexApi::System::getCustomFontPath();
float fontSize = ImHexApi::System::getFontSize();
if (fontFile.empty()) { if (fontFile.empty()) {
// Load default font if no custom one has been specified // Load default font if no custom one has been specified
fonts->Clear(); fonts->Clear();
cfg.OversampleH = cfg.OversampleV = 1, cfg.PixelSnapH = true;
cfg.SizePixels = fontSize;
fonts->AddFontDefault(&cfg); fonts->AddFontDefault(&cfg);
} else { } else {
// Load custom font // Load custom font
fonts->AddFontFromFileTTF(hex::toUTF8String(fontFile).c_str(), std::floor(fontSize * scale), &cfg, ranges.Data); // Needs conversion to char for Windows
cfg.OversampleH = cfg.OversampleV = 1, cfg.PixelSnapH = true;
cfg.SizePixels = fontSize;
fonts->AddFontFromFileTTF(hex::toUTF8String(fontFile).c_str(), std::floor(fontSize), &cfg, ranges.Data); // Needs conversion to char for Windows
} }
cfg.MergeMode = true; cfg.MergeMode = true;
fonts->AddFontFromMemoryCompressedTTF(font_awesome_compressed_data, font_awesome_compressed_size, fontSize, &cfg, fontAwesomeRange); fonts->AddFontFromMemoryCompressedTTF(font_awesome_compressed_data, font_awesome_compressed_size, fontSize * scale, &cfg, fontAwesomeRange);
fonts->AddFontFromMemoryCompressedTTF(codicons_compressed_data, codicons_compressed_size, fontSize, &cfg, codiconsRange); fonts->AddFontFromMemoryCompressedTTF(codicons_compressed_data, codicons_compressed_size, fontSize * scale, &cfg, codiconsRange);
bool enableUnicode = ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.enable_unicode", true); bool enableUnicode = ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.enable_unicode", true);
if (enableUnicode) if (enableUnicode)
fonts->AddFontFromMemoryCompressedTTF(unifont_compressed_data, unifont_compressed_size, fontSize, &cfg, unifontRange); fonts->AddFontFromMemoryCompressedTTF(unifont_compressed_data, unifont_compressed_size, fontSize * scale, &cfg, unifontRange);
fonts->Build(); fonts->Build();

1
main/source/window/window.cpp
View File

@ -693,6 +693,7 @@ namespace hex {
io.ConfigFlags |= ImGuiConfigFlags_DockingEnable | ImGuiConfigFlags_NavEnableKeyboard; io.ConfigFlags |= ImGuiConfigFlags_DockingEnable | ImGuiConfigFlags_NavEnableKeyboard;
io.ConfigWindowsMoveFromTitleBarOnly = true; io.ConfigWindowsMoveFromTitleBarOnly = true;
io.FontGlobalScale = 1.0F / ImHexApi::System::getNativeScale();
if (glfwGetPrimaryMonitor() != nullptr) { if (glfwGetPrimaryMonitor() != nullptr) {
auto sessionType = hex::getEnvironmentVariable("XDG_SESSION_TYPE"); auto sessionType = hex::getEnvironmentVariable("XDG_SESSION_TYPE");