Merged stabilization/2106 -> development (resolved merge conflicts).

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-08 13:56:47 -05:00
parent 0730960a4f d075d5f7b5
commit 3b1873b045
489 changed files with 1685 additions and 13777 deletions
@@ -120,6 +120,7 @@ namespace AtomToolsFramework
        void SetFullScreenState(bool fullScreenState) override;
        bool CanToggleFullScreenState() const override;
        void ToggleFullScreenState() override;
+        float GetDpiScaleFactor() const override;

    protected:
        // AzFramework::InputChannelEventListener ...
@@ -491,4 +491,9 @@ namespace AtomToolsFramework
    {
        // The RenderViewportWidget does not currently support full screen.
    }
+
+    float RenderViewportWidget::GetDpiScaleFactor() const
+    {
+        return aznumeric_cast<float>(devicePixelRatioF());
+    }
 } //namespace AtomToolsFramework