From 248a400b883165be9746d247d4d4517ff869ca03 Mon Sep 17 00:00:00 2001
From: reuk <reuk@users.noreply.github.com>
Date: Mon, 22 Apr 2024 19:08:17 +0100
Subject: [PATCH] D2D: Use currently-selected colour when replace-clearing
 NativeImage

---
 modules/juce_graphics/images/juce_Image.cpp   | 12 +++++-----
 .../juce_Direct2DGraphicsContext_windows.cpp  | 23 ++++++++-----------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/modules/juce_graphics/images/juce_Image.cpp b/modules/juce_graphics/images/juce_Image.cpp
index e593d95392..c001bf5669 100644
--- a/modules/juce_graphics/images/juce_Image.cpp
+++ b/modules/juce_graphics/images/juce_Image.cpp
@@ -522,12 +522,12 @@ void Image::BitmapData::setPixelColour (int x, int y, Colour colour) const noexc
 //==============================================================================
 void Image::clear (const Rectangle<int>& area, Colour colourToClearTo)
 {
-    if (image != nullptr)
-    {
-        auto g = image->createLowLevelContext();
-        g->setFill (colourToClearTo);
-        g->fillRect (area, true);
-    }
+    if (image == nullptr)
+        return;
+
+    auto g = image->createLowLevelContext();
+    g->setFill (colourToClearTo);
+    g->fillRect (area, true);
 }
 
 //==============================================================================
diff --git a/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp b/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp
index fac464eaef..74ca54db6c 100644
--- a/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp
+++ b/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp
@@ -466,11 +466,6 @@ public:
         targetAlpha = alpha;
     }
 
-    virtual void clearBackground()
-    {
-        deviceResources.deviceContext.context->Clear (backgroundColor);
-    }
-
     virtual SavedState* startFrame (float dpiScale)
     {
         prepare();
@@ -1176,18 +1171,18 @@ void Direct2DGraphicsContext::setInterpolationQuality (Graphics::ResamplingQuali
 void Direct2DGraphicsContext::fillRect (const Rectangle<int>& r, bool replaceExistingContents)
 {
     if (replaceExistingContents)
-    {
-        JUCE_SCOPED_TRACE_EVENT_FRAME_RECT_I32 (etw::fillRectReplace, etw::direct2dKeyword, getFrameId(), r);
-
-        applyPendingClipList();
         clipToRectangle (r);
-        getPimpl()->clearBackground();
-        currentState->popTopLayer();
-    }
 
-    auto fill = [] (Rectangle<float> rect, ComSmartPtr<ID2D1DeviceContext1> deviceContext, ComSmartPtr<ID2D1Brush> brush)
+    const auto clearColour = currentState->fillType.colour;
+
+    auto fill = [replaceExistingContents, clearColour] (Rectangle<float> rect,
+                                                        ComSmartPtr<ID2D1DeviceContext1> deviceContext,
+                                                        ComSmartPtr<ID2D1Brush> brush)
     {
-        deviceContext->FillRectangle (D2DUtilities::toRECT_F (rect), brush);
+        if (replaceExistingContents)
+            deviceContext->Clear (D2DUtilities::toCOLOR_F (clearColour));
+        else
+            deviceContext->FillRectangle (D2DUtilities::toRECT_F (rect), brush);
     };
 
     getPimpl()->paintPrimitive (r.toFloat(), fill);