Merge branch 'development' into Atom/dmcdiar/ATOM-16896

2021-12-09 17:21:47 -07:00
parent c58a742296 c6e06a64ca
commit 4e7a45a6c5
72 changed files with 2020 additions and 749 deletions
@@ -1362,8 +1362,9 @@ namespace AZ::AtomBridge
        // if 2d draw need to project pos to screen first
        AzFramework::TextDrawParameters params;
        AZ::RPI::ViewportContextPtr viewportContext = GetViewportContext();
+        const auto dpiScaleFactor = viewportContext->GetDpiScalingFactor();
        params.m_drawViewportId = viewportContext->GetId(); // get the viewport ID so default viewport works
-        params.m_position = AZ::Vector3(x, y, 1.0f);
+        params.m_position = AZ::Vector3(x * dpiScaleFactor, y * dpiScaleFactor, 1.0f);
        params.m_color = m_rendState.m_color;
        params.m_scale = AZ::Vector2(size);
        params.m_hAlign = center ? AzFramework::TextHorizontalAlignment::Center : AzFramework::TextHorizontalAlignment::Left; //! Horizontal text alignment