From 203e99c57d766005b0df40eb672106126bd1b381 Mon Sep 17 00:00:00 2001
From: reuk <reuk@users.noreply.github.com>
Date: Mon, 22 Apr 2024 18:10:21 +0100
Subject: [PATCH] D2D: Update
 Direct2DGraphicsContext::getPhysicalPixelScaleFactor to include context
 transform for consistency with other renderer backends

---
 .../native/juce_Direct2DGraphicsContext_windows.cpp  | 12 ++++++------
 .../native/juce_Direct2DGraphicsContext_windows.h    |  4 ----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp b/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp
index 49c6bdc5d1..785b380030 100644
--- a/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp
+++ b/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp
@@ -946,11 +946,6 @@ void Direct2DGraphicsContext::excludeClipRectangle (const Rectangle<int>& userSp
     }
 }
 
-void Direct2DGraphicsContext::setPhysicalPixelScaleFactor (float f)
-{
-    scale = f;
-}
-
 void Direct2DGraphicsContext::resetPendingClipList()
 {
     auto& transform = currentState->currentTransform;
@@ -1403,7 +1398,12 @@ const Font& Direct2DGraphicsContext::getFont()
 
 float Direct2DGraphicsContext::getPhysicalPixelScaleFactor() const
 {
-    return scale;
+    if (currentState != nullptr)
+        return currentState->currentTransform.getPhysicalPixelScaleFactor();
+
+    // If this is hit, there's no frame in progress, so the scale factor isn't meaningful
+    jassertfalse;
+    return 1.0f;
 }
 
 void Direct2DGraphicsContext::drawRoundedRectangle (const Rectangle<float>& area, float cornerSize, float lineThickness)
diff --git a/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h b/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h
index c312c0a234..ba906a00cf 100644
--- a/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h
+++ b/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h
@@ -113,9 +113,6 @@ public:
     static int constexpr minFrameSize = 1;
     static int constexpr maxFrameSize = 16384;
 
-    //==============================================================================
-    void setPhysicalPixelScaleFactor (float);
-
 protected:
     struct SavedState;
     SavedState* currentState = nullptr;
@@ -170,7 +167,6 @@ protected:
     };
 
     uint64_t frame = 0;
-    float scale = 1.0f;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Direct2DGraphicsContext)
 };