use only dpi scale based on x

bmchtech · Oct 12, 2024 · b7f58ee · b7f58ee
1 parent 0b36bfc
commit b7f58ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/source/re/core.d b/source/re/core.d
@@ -352,8 +352,8 @@ abstract class Core {
     private void calculate_render_resolution() {
         // since window was resized, update our render resolution
         // first get the new window size
-        auto render_res_x = window.render_width * window.dpi_scale_x;
-        auto render_res_y = window.render_height * window.dpi_scale_y;
+        auto render_res_x = window.render_width * window.dpi_scale;
+        auto render_res_y = window.render_height * window.dpi_scale;
 
         // set mouse scale
         auto mouse_scale_factor = 1.0 * scale_factor;
@@ -373,7 +373,7 @@ abstract class Core {
 
     /// overall scale factor from screen space coordinates to render space
     static @property float scale_factor() {
-        return window.dpi_max_scale * render_oversample_factor;
+        return window.dpi_scale * render_oversample_factor;
     }
 }
 

diff --git a/source/re/gfx/window.d b/source/re/gfx/window.d
@@ -49,19 +49,8 @@ class Window {
         raylib.CloseWindow();
     }
 
-    public @property float dpi_max_scale() {
-        auto scale_dpi_vec = raylib.GetWindowScaleDPI();
-        return max(scale_dpi_vec.x, scale_dpi_vec.y);
-    }
-
-    public @property float dpi_scale_x() {
-        auto scale_dpi_vec = raylib.GetWindowScaleDPI();
-        return scale_dpi_vec.x;
-    }
-
-    public @property float dpi_scale_y() {
-        auto scale_dpi_vec = raylib.GetWindowScaleDPI();
-        return scale_dpi_vec.y;
+    public @property float dpi_scale() {
+        return raylib.GetWindowScaleDPI().x;
     }
 
     public @property int screen_width() {
@@ -73,7 +62,7 @@ class Window {
     }
 
     public @property Rectangle screen_bounds() {
-        return Rectangle(0, 0, screen_width * Core.window.dpi_scale_x, screen_height * Core.window.dpi_scale_y);
+        return Rectangle(0, 0, screen_width * Core.window.dpi_scale, screen_height * Core.window.dpi_scale);
     }
 
     public @property int render_width() {