4 files changed, 41 insertions, 25 deletions

diff --git a/src/ui/metrics.c b/src/ui/metrics.c
index 2405eae4..32561ed7 100644
--- a/src/ui/metrics.c
+++ b/src/ui/metrics.c
@@ -32,14 +32,14 @@ int   gap_UI      = defaultGap_Metrics;
 iInt2 gap2_UI     = { defaultGap_Metrics, defaultGap_Metrics };
 int   fontSize_UI = defaultFontSize_Metrics;
 
-void setPixelRatio_Metrics(float pixelRatio) {
+void setScale_Metrics(float scale) {
 #if defined (iPlatformAppleMobile)
     /* iPad needs a bit larger UI elements as the viewing distance is generally longer.*/
     if (deviceType_App() == tablet_AppDeviceType) {
-        pixelRatio *= 1.1f;
+        scale *= 1.1f;
     }
 #endif
-    gap_UI      = iRound(defaultGap_Metrics * pixelRatio);
+    gap_UI      = iRound(defaultGap_Metrics * scale);
     gap2_UI     = init1_I2(gap_UI);
-    fontSize_UI = iRound(defaultFontSize_Metrics * pixelRatio);
+    fontSize_UI = iRound(defaultFontSize_Metrics * scale);
 }
diff --git a/src/ui/metrics.h b/src/ui/metrics.h
index 207dd59d..b314f65a 100644
--- a/src/ui/metrics.h
+++ b/src/ui/metrics.h
@@ -28,4 +28,4 @@ extern int   gap_UI;
 extern int   fontSize_UI;
 extern iInt2 gap2_UI;
 
-void    setPixelRatio_Metrics       (float pixelRatio);
+void    setScale_Metrics       (float scale);
diff --git a/src/ui/window.c b/src/ui/window.c
index 21864dce..88ede747 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1276,19 +1276,30 @@ void drawWhileResizing_Window(iWindow *d, int w, int h) {
 }
 
 static float pixelRatio_Window_(const iWindow *d) {
+    int dx, x;
+    SDL_GetRendererOutputSize(d->render, &dx, NULL);
+    SDL_GetWindowSize(d->win, &x, NULL);
+    return (float) dx / (float) x;
+}
+
+#if defined (iPlatformApple)
+#   define baseDPI_Window   113.5f
+#else
+#   define baseDPI_Window   96.0f
+#endif
+
+static float displayScale_Window_(const iWindow *d) {
 #if defined (iPlatformMsys)
     iUnused(d);
     return desktopDPI_Win32();
-#elif defined (iPlatformLinux)
+#else
     float vdpi = 0.0f;
     SDL_GetDisplayDPI(SDL_GetWindowDisplayIndex(d->win), NULL, NULL, &vdpi);
-    const float factor = vdpi / 96.0f;
-    return iMax(1.0f, factor);
-#else
-    int dx, x;
-    SDL_GetRendererOutputSize(d->render, &dx, NULL);
-    SDL_GetWindowSize(d->win, &x, NULL);
-    return (float) dx / (float) x;
+    const float factor = vdpi / baseDPI_Window / pixelRatio_Window_(d);
+    if (factor < 0.75f) {
+        return 1.0f; /* seems invalid */
+    }
+    return iMax(0.75f, factor);
 #endif
 }
 
@@ -1443,14 +1454,15 @@ void init_Window(iWindow *d, iRect rect) {
 #endif
     }
     drawBlank_Window_(d);
-    d->uiScale = initialUiScale_;
-    d->pixelRatio = pixelRatio_Window_(d);
-    setPixelRatio_Metrics(d->pixelRatio * d->uiScale);
+    d->pixelRatio   = pixelRatio_Window_(d); /* point/pixel conversion */
+    d->displayScale = displayScale_Window_(d);
+    d->uiScale      = initialUiScale_;
+    setScale_Metrics(d->pixelRatio * d->displayScale * d->uiScale);
 #if defined (iPlatformMsys)
     SDL_Rect usable;
     SDL_GetDisplayUsableBounds(0, &usable);
     SDL_SetWindowMaximumSize(d->win, usable.w, usable.h);
-    SDL_SetWindowMinimumSize(d->win, minSize.x * d->pixelRatio, minSize.y * d->pixelRatio);
+    SDL_SetWindowMinimumSize(d->win, minSize.x * d->displayScale, minSize.y * d->displayScale);
     useExecutableIconResource_SDLWindow(d->win);
 #endif
 #if defined (iPlatformLinux)
@@ -1581,15 +1593,24 @@ static iBool unsnap_Window_(iWindow *d, const iInt2 *newPos) {
 
 static void notifyMetricsChange_Window_(const iWindow *d) {
     /* Dynamic UI metrics change. Widgets need to update themselves. */
-    setPixelRatio_Metrics(d->pixelRatio * d->uiScale);
+    setScale_Metrics(d->pixelRatio * d->displayScale * d->uiScale);
     resetFonts_Text();
     postCommand_App("metrics.changed");
 }
 
 static void checkPixelRatioChange_Window_(iWindow *d) {
+    iBool wasChanged = iFalse;
     const float ratio = pixelRatio_Window_(d);
     if (iAbs(ratio - d->pixelRatio) > 0.001f) {
         d->pixelRatio = ratio;
+        wasChanged = iTrue;
+    }
+    const float scale = displayScale_Window_(d);
+    if (iAbs(scale - d->displayScale) > 0.001f) {
+        d->displayScale = scale;
+        wasChanged = iTrue;
+    }
+    if (wasChanged) {
         notifyMetricsChange_Window_(d);
     }
 }
@@ -1993,13 +2014,7 @@ iInt2 visibleRootSize_Window(const iWindow *d) {
 }
 
 iInt2 coord_Window(const iWindow *d, int x, int y) {
-#if defined (iPlatformMsys) || defined (iPlatformLinux)
-    /* On Windows, surface coordinates are in pixels. */
-    return init_I2(x, y);
-#else
-    /* Coordinates are in points. */
     return mulf_I2(init_I2(x, y), d->pixelRatio);
-#endif
 }
 
 iInt2 mouseCoord_Window(const iWindow *d) {
diff --git a/src/ui/window.h b/src/ui/window.h
index 6960e03e..e3d8b22b 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -67,7 +67,8 @@ struct Impl_Window {
     uint32_t      focusGainedAt;
     SDL_Renderer *render;
     iWidget *     root;
-    float         pixelRatio;
+    float         pixelRatio; /* conversion between points and pixels, e.g., coords, window size */
+    float         displayScale; /* DPI-based scaling factor of current display, affects uiScale only */
     float         uiScale;
     uint32_t      frameTime;
     double        presentTime;