Merge branch 'praydog:master' into master

Author: joeyhodge

src/REFramework.cpp

@@ -1490,7 +1490,7 @@ void REFramework::update_fonts() {
         0
     };
 
-    ImFont* fsload = fonts->AddFontFromMemoryCompressedTTF((void*)RobotoCJKSC_Medium_compressed_data, RobotoCJKSC_Medium_compressed_size, (float)m_font_size, &custom_icons, cjk_ranges);
+    fonts->AddFontFromMemoryCompressedTTF((void*)RobotoCJKSC_Medium_compressed_data, RobotoCJKSC_Medium_compressed_size, (float)m_font_size, &custom_icons, cjk_ranges);
 
     // https://fontawesome.com/
     custom_icons.PixelSnapH = true;
@@ -1509,7 +1509,10 @@ void REFramework::update_fonts() {
         if (fs::exists(font.filepath)) {
             font.font = fonts->AddFontFromFileTTF(font.filepath.string().c_str(), (float)font.size, nullptr, ranges);
         } else {
-            font.font = fsload; // fonts->AddFontFromMemoryCompressedTTF(RobotoMedium_compressed_data, RobotoMedium_compressed_size, (float)font.size, nullptr, ranges);
+            if (ranges == nullptr) {
+                ranges = cjk_ranges;
+            }
+            font.font = fonts->AddFontFromMemoryCompressedTTF((void*)RobotoCJKSC_Medium_compressed_data, RobotoCJKSC_Medium_compressed_size, (float)font.size, nullptr, ranges);
         }
     }
 

src/mods/Graphics.cpp

@@ -758,7 +758,36 @@ void Graphics::do_ultrawide_fix() {
     // This disables any kind of pillarboxing and letterboxing.
     // This cannot be directly restored once applied.
     if (set_display_type_method != nullptr) {
-        set_display_type_method->call(sdk::get_thread_context(), main_view, via::DisplayType::Fit);
+        auto display_type = via::DisplayType::Fit;
+        auto graphics = Graphics::get();
+
+        if (graphics->m_backbuffer_size.has_value()) {
+            const auto& size = graphics->m_backbuffer_size.value();
+            const double ratio = static_cast<double>(size[0]) / static_cast<double>(size[1]);
+            constexpr double epsilon = 0.01;
+            constexpr double _4_3   = 4.0 / 3.0;
+            constexpr double _16_9  = 16.0 / 9.0;
+            constexpr double _16_10 = 16.0 / 10.0;
+            constexpr double _21_9  = 21.0 / 9.0;
+            constexpr double _32_9  = 32.0 / 9.0;
+            constexpr double _48_9  = 48.0 / 9.0;
+            
+            if (glm::abs(ratio - _4_3) < epsilon) {
+                display_type = via::DisplayType::Uniform4x3;
+            } else if (glm::abs(ratio - _16_9) < epsilon) {
+                display_type = via::DisplayType::Uniform16x9;
+            } else if (glm::abs(ratio - _16_10) < epsilon) {
+                display_type = via::DisplayType::Uniform16x10;
+            } else if (glm::abs(ratio - _21_9) < epsilon) {
+                display_type = via::DisplayType::Uniform21x9;
+            } else if (glm::abs(ratio - _32_9) < epsilon) {
+                display_type = via::DisplayType::Uniform32x9;
+            } else if (glm::abs(ratio - _48_9) < epsilon) {
+                display_type = via::DisplayType::Uniform48x9;
+            }
+        }
+
+        set_display_type_method->call(sdk::get_thread_context(), main_view, display_type);
     }
 }