From a45f05c1dbd0778dbe04ca3688ada4377d2f77a6 Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Thu, 18 Apr 2019 14:15:42 +0100
Subject: [PATCH] Linux:  Take global scale factor into account when setting
 peer scale factor

---
 modules/juce_gui_basics/native/juce_linux_X11_Windowing.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/juce_gui_basics/native/juce_linux_X11_Windowing.cpp b/modules/juce_gui_basics/native/juce_linux_X11_Windowing.cpp
index ac9afa994d..401512bb1c 100644
--- a/modules/juce_gui_basics/native/juce_linux_X11_Windowing.cpp
+++ b/modules/juce_gui_basics/native/juce_linux_X11_Windowing.cpp
@@ -1202,7 +1202,7 @@ public:
 
             auto& displays = Desktop::getInstance().getDisplays();
 
-            auto newScaleFactor = displays.findDisplayForRect (bounds, true).scale;
+            auto newScaleFactor = displays.findDisplayForRect (bounds, true).scale / Desktop::getInstance().getGlobalScaleFactor();
             if (! approximatelyEqual (newScaleFactor, currentScaleFactor))
             {
                 currentScaleFactor = newScaleFactor;
@@ -2796,7 +2796,7 @@ private:
             Rectangle<int> physicalBounds (wx, wy, (int) ww, (int) wh);
             auto& displays = Desktop::getInstance().getDisplays();
 
-            auto newScaleFactor = displays.findDisplayForRect (physicalBounds, true).scale;
+            auto newScaleFactor = displays.findDisplayForRect (physicalBounds, true).scale / Desktop::getInstance().getGlobalScaleFactor();
             if (! approximatelyEqual (newScaleFactor, currentScaleFactor))
             {
                 currentScaleFactor = newScaleFactor;