| @@ -435,8 +435,7 @@ static bool isPerMonitorDPIAwareProcess() | |||||
| { | { | ||||
| #if ! JUCE_WIN_PER_MONITOR_DPI_AWARE | #if ! JUCE_WIN_PER_MONITOR_DPI_AWARE | ||||
| return false; | return false; | ||||
| #endif | |||||
| #else | |||||
| static bool dpiAware = []() -> bool | static bool dpiAware = []() -> bool | ||||
| { | { | ||||
| setDPIAwareness(); | setDPIAwareness(); | ||||
| @@ -451,15 +450,15 @@ static bool isPerMonitorDPIAwareProcess() | |||||
| }(); | }(); | ||||
| return dpiAware; | return dpiAware; | ||||
| #endif | |||||
| } | } | ||||
| static bool isPerMonitorDPIAwareWindow (HWND nativeWindow) | static bool isPerMonitorDPIAwareWindow (HWND nativeWindow) | ||||
| { | { | ||||
| #if ! JUCE_WIN_PER_MONITOR_DPI_AWARE | #if ! JUCE_WIN_PER_MONITOR_DPI_AWARE | ||||
| ignoreUnused (h); | |||||
| ignoreUnused (nativeWindow); | |||||
| return false; | return false; | ||||
| #endif | |||||
| #else | |||||
| setDPIAwareness(); | setDPIAwareness(); | ||||
| if (getWindowDPIAwarenessContext != nullptr | if (getWindowDPIAwarenessContext != nullptr | ||||
| @@ -470,14 +469,14 @@ static bool isPerMonitorDPIAwareWindow (HWND nativeWindow) | |||||
| } | } | ||||
| return isPerMonitorDPIAwareProcess(); | return isPerMonitorDPIAwareProcess(); | ||||
| #endif | |||||
| } | } | ||||
| static bool isPerMonitorDPIAwareThread() | static bool isPerMonitorDPIAwareThread() | ||||
| { | { | ||||
| #if ! JUCE_WIN_PER_MONITOR_DPI_AWARE | #if ! JUCE_WIN_PER_MONITOR_DPI_AWARE | ||||
| return false; | return false; | ||||
| #endif | |||||
| #else | |||||
| setDPIAwareness(); | setDPIAwareness(); | ||||
| if (getThreadDPIAwarenessContext != nullptr | if (getThreadDPIAwarenessContext != nullptr | ||||
| @@ -488,6 +487,7 @@ static bool isPerMonitorDPIAwareThread() | |||||
| } | } | ||||
| return isPerMonitorDPIAwareProcess(); | return isPerMonitorDPIAwareProcess(); | ||||
| #endif | |||||
| } | } | ||||
| static double getGlobalDPI() | static double getGlobalDPI() | ||||
| @@ -1949,8 +1949,7 @@ public: | |||||
| { | { | ||||
| #if ! JUCE_WIN_PER_MONITOR_DPI_AWARE | #if ! JUCE_WIN_PER_MONITOR_DPI_AWARE | ||||
| return 1.0; | return 1.0; | ||||
| #endif | |||||
| #else | |||||
| if (! isPerMonitorDPIAwareWindow (hwnd)) | if (! isPerMonitorDPIAwareWindow (hwnd)) | ||||
| return 1.0; | return 1.0; | ||||
| @@ -1964,6 +1963,7 @@ public: | |||||
| } | } | ||||
| return scaleFactor; | return scaleFactor; | ||||
| #endif | |||||
| } | } | ||||
| private: | private: | ||||