Fix DPI scaling

schaferk · Aug 17, 2023 · 6dac816 · 6dac816
1 parent 68b188c
commit 6dac816
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/android/main.cpp b/android/main.cpp
@@ -95,6 +95,7 @@ void init(struct android_app *app)
         // ImGui::StyleColorsClassic();
 
         satdump::initMainUI();
+        style::setFonts();
         was_init = true;
     }
 

diff --git a/src-core/common/widgets/markdown_helper.cpp b/src-core/common/widgets/markdown_helper.cpp
@@ -25,14 +25,13 @@ namespace widgets
     void MarkdownHelper::init()
     {
         mdConfig.linkCallback = link_callback;
-
-        mdConfig.headingFormats[0] = {style::bigFont, true};
-        mdConfig.headingFormats[1] = {style::bigFont, true};
-        mdConfig.headingFormats[2] = {style::baseFont, true};
     };
 
     void MarkdownHelper::render()
     {
+        mdConfig.headingFormats[0] = { style::bigFont, true };
+        mdConfig.headingFormats[1] = { style::bigFont, true };
+        mdConfig.headingFormats[2] = { style::baseFont, true };
         ImGui::Markdown(markdown_.c_str(), markdown_.length(), mdConfig);
     }
 

diff --git a/src-core/core/style.cpp b/src-core/core/style.cpp
@@ -178,7 +178,7 @@ namespace style
 
     void setFonts()
     {
-
+        ImGui::GetIO().Fonts->Clear();
         ImFontGlyphRangesBuilder builder;
         static const ImWchar def[] = {0x20, 0x2300, 0}; //default range
         static ImFontConfig config;
@@ -189,7 +189,9 @@ namespace style
         for (int i = 0; i < 6; i++)
             baseFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(resources::getResourcePath("fonts/font.ttf").c_str(), 16.0f * ui_scale, &config, list[i]); 
 
+        config.MergeMode = false;
         bigFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(resources::getResourcePath("fonts/Roboto-Medium.ttf").c_str(), 45.0f * ui_scale);   //, &config, ranges);
         //hugeFont = ImGui::GetIO().Fonts->AddFontFromFileTTF(resources::getResourcePath("fonts/Roboto-Medium.ttf").c_str(), 128.0f * ui_scale); //, &config, ranges);
+        ImGui::GetIO().Fonts->Build();
     }
 }
diff --git a/src-ui/main.cpp b/src-ui/main.cpp
@@ -223,6 +223,15 @@ int main(int argc, char *argv[])
     // Init UI
     satdump::initMainUI();
 
+    //Shut down loading screen
+    logger->del_sink(loading_screen_sink);
+    loading_screen_sink.reset();
+
+    //Set font again to adjust for DPI
+    style::setFonts();
+    ImGui_ImplOpenGL3_DestroyFontsTexture();
+    ImGui_ImplOpenGL3_CreateFontsTexture();
+
     if (satdump::processing::is_processing)
     {
         satdump::ui_thread_pool.push([&](int)
@@ -235,10 +244,6 @@ int main(int argc, char *argv[])
                                      {  satdump::updateTLEFile(satdump::user_path + "/satdump_tles.txt"); 
                                         satdump::loadTLEFileIntoRegistry(satdump::user_path + "/satdump_tles.txt"); });
 
-    //Shut down loading screen
-    logger->del_sink(loading_screen_sink);
-    loading_screen_sink.reset();
-
     // Main loop
     do
     {