Browse Source

Windows: Fixed a build error when JUCE_WIN_PER_MONITOR_DPI_AWARE = 0

tags/2021-05-28
ed 6 years ago
parent
commit
0969b946f6
1 changed files with 28 additions and 24 deletions
  1. +28
    -24
      modules/juce_gui_basics/native/juce_win32_Windowing.cpp

+ 28
- 24
modules/juce_gui_basics/native/juce_win32_Windowing.cpp View File

@@ -411,25 +411,27 @@ static void setDPIAwareness()
setProcessDPIAware();
}
#if JUCE_WIN_PER_MONITOR_DPI_AWARE
static bool isPerMonitorDPIAwareProcess()
{
static bool dpiAware = []() -> bool
{
setDPIAwareness();
static bool isPerMonitorDPIAwareProcess()
{
#if JUCE_WIN_PER_MONITOR_DPI_AWARE
static bool dpiAware = []() -> bool
{
setDPIAwareness();
if (getProcessDPIAwareness == nullptr)
return false;
if (getProcessDPIAwareness == nullptr)
return false;
DPI_Awareness context;
getProcessDPIAwareness (0, &context);
DPI_Awareness context;
getProcessDPIAwareness (0, &context);
return context == DPI_Awareness::DPI_Awareness_Per_Monitor_Aware;
}();
return context == DPI_Awareness::DPI_Awareness_Per_Monitor_Aware;
}();
return dpiAware;
}
#endif
return dpiAware;
#else
return false;
#endif
}
static bool isPerMonitorDPIAwareWindow (HWND h)
{
@@ -448,17 +450,19 @@ static bool isPerMonitorDPIAwareWindow (HWND h)
#endif
}
#if JUCE_WIN_PER_MONITOR_DPI_AWARE
static bool isPerMonitorDPIAwareThread()
{
setDPIAwareness();
static bool isPerMonitorDPIAwareThread()
{
#if JUCE_WIN_PER_MONITOR_DPI_AWARE
setDPIAwareness();
if (getThreadDPIAwarenessContext != nullptr && getAwarenessFromDPIAwarenessContext != nullptr)
return getAwarenessFromDPIAwarenessContext (getThreadDPIAwarenessContext()) == DPI_Awareness::DPI_Awareness_Per_Monitor_Aware;
if (getThreadDPIAwarenessContext != nullptr && getAwarenessFromDPIAwarenessContext != nullptr)
return getAwarenessFromDPIAwarenessContext (getThreadDPIAwarenessContext()) == DPI_Awareness::DPI_Awareness_Per_Monitor_Aware;
return isPerMonitorDPIAwareProcess();
}
#endif
return isPerMonitorDPIAwareProcess();
#else
return false;
#endif
}
static double getGlobalDPI()
{


Loading…
Cancel
Save