Merge remote-tracking branch 'origin/master' into 1.2

2021-03-30 17:58:29 +02:00
parent a6d488c4ef 7456bf38f7
commit b0fe4e9945
38 changed files with 303 additions and 109 deletions
--- a/Source/Engine/Main/UWP/main.h
+++ b/Source/Engine/Main/UWP/main.h
@@ -189,10 +189,10 @@ public:
        *height = bounds.Height;
    }

-    void GetDpi(float* dpi) override
+    void GetDpi(int* dpi) override
    {
        auto currentDisplayInformation = Windows::Graphics::Display::DisplayInformation::GetForCurrentView();
-        *dpi = currentDisplayInformation->LogicalDpi;
+        *dpi = (int)currentDisplayInformation->LogicalDpi;
    }

    void GetTitle(wchar_t* buffer, int bufferLength) override