From 22436d93412e8dbc0dc28b74a5d3b42831468e9f Mon Sep 17 00:00:00 2001
From: dbr <dbr.onix@gmail.com>
Date: Sat, 20 Nov 2021 20:25:19 +1100
Subject: [PATCH] Fix DPI scaling in examples

- winit handles the DPI factor scaling
- Remove "rounded" mode which is only sensible with default bitmap screen on a low pixel density screen
- As such change default font to the already-in-repo Roboto
- Adds env-var to examples to force scaling factor for debug purposes
---
 imgui-examples/examples/support/mod.rs | 44 +++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/imgui-examples/examples/support/mod.rs b/imgui-examples/examples/support/mod.rs
index aea615a2e..af26bc2f8 100644
--- a/imgui-examples/examples/support/mod.rs
+++ b/imgui-examples/examples/support/mod.rs
@@ -46,15 +46,41 @@ pub fn init(title: &str) -> System {
     {
         let gl_window = display.gl_window();
         let window = gl_window.window();
-        platform.attach_window(imgui.io_mut(), window, HiDpiMode::Rounded);
+
+        let dpi_mode = if let Ok(factor) = std::env::var("IMGUI_EXAMPLE_FORCE_DPI_FACTOR") {
+            // Allow forcing of HiDPI factor for debugging purposes
+            match factor.parse::<f64>() {
+                Ok(f) => HiDpiMode::Locked(f),
+                Err(e) => panic!("Invalid scaling factor: {}", e),
+            }
+        } else {
+            HiDpiMode::Default
+        };
+
+        platform.attach_window(imgui.io_mut(), window, dpi_mode);
     }
 
-    let hidpi_factor = platform.hidpi_factor();
-    let font_size = (13.0 * hidpi_factor) as f32;
+    // Fixed font size. Note imgui_winit_support uses "logical
+    // pixels", which are physical pixels scaled by the devices
+    // scaling factor. Meaning, 13.0 pixels should look the same size
+    // on two different screens, and thus we do not need to scale this
+    // value (as the scaling is handled by winit)
+    let font_size = 13.0;
+
     imgui.fonts().add_font(&[
-        FontSource::DefaultFontData {
+        FontSource::TtfData {
+            data: include_bytes!("../../../resources/Roboto-Regular.ttf"),
+            size_pixels: font_size,
             config: Some(FontConfig {
-                size_pixels: font_size,
+                // As imgui-glium-renderer isn't gamma-correct with
+                // it's font rendering, we apply an arbitrary
+                // multiplier to make the font a bit "heavier". With
+                // default imgui-glow-renderer this is unnecessary.
+                rasterizer_multiply: 1.5,
+                // Oversampling font helps improve text rendering at
+                // expense of larger font atlas texture.
+                oversample_h: 4,
+                oversample_v: 4,
                 ..FontConfig::default()
             }),
         },
@@ -62,15 +88,17 @@ pub fn init(title: &str) -> System {
             data: include_bytes!("../../../resources/mplus-1p-regular.ttf"),
             size_pixels: font_size,
             config: Some(FontConfig {
-                rasterizer_multiply: 1.75,
+                // Oversampling font helps improve text rendering at
+                // expense of larger font atlas texture.
+                oversample_h: 4,
+                oversample_v: 4,
+                // Range of glyphs to rasterize
                 glyph_ranges: FontGlyphRanges::japanese(),
                 ..FontConfig::default()
             }),
         },
     ]);
 
-    imgui.io_mut().font_global_scale = (1.0 / hidpi_factor) as f32;
-
     let renderer = Renderer::init(&mut imgui, &display).expect("Failed to initialize renderer");
 
     System {