mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-30 02:50:05 +00:00
Code Activity

Workaround to avoid problems if OSX fails to return any monitor sizes while monitors are being re-arranged.

Browse source
This commit is contained in:
jules 2014-06-04 22:10:59 +01:00
parent 4ab9cdf33a
commit 4935236b41
2 changed files with 43 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/juce_gui_basics/components/juce_Desktop.cpp
View file

@ -329,6 +329,7 @@ void Desktop::Displays::refresh()
oldDisplays.swapWith (displays);
init (Desktop::getInstance());
jassert (displays.size() > 0);
if (oldDisplays != displays)
{

64
modules/juce_gui_basics/native/juce_mac_Windowing.mm
View file

@ -354,6 +354,41 @@ static Rectangle<int> convertDisplayRect (NSRect r, CGFloat mainScreenBottom)
return convertToRectInt (r);
}
static Desktop::Displays::Display getDisplayFromScreen (NSScreen* s, CGFloat& mainScreenBottom, const float masterScale)
{
Desktop::Displays::Display d;
d.isMain = (mainScreenBottom == 0);
if (d.isMain)
mainScreenBottom = [s frame].size.height;
d.userArea = convertDisplayRect ([s visibleFrame], mainScreenBottom) / masterScale;
d.totalArea = convertDisplayRect ([s frame], mainScreenBottom) / masterScale;
d.scale = masterScale;
#if defined (MAC_OS_X_VERSION_10_7) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
if ([s respondsToSelector: @selector (backingScaleFactor)])
d.scale *= s.backingScaleFactor;
#endif
NSSize dpi = [[[s deviceDescription] objectForKey: NSDeviceResolution] sizeValue];
d.dpi = (dpi.width + dpi.height) / 2.0;
return d;
}
static Desktop::Displays::Display getDummyScreen (const float masterScale)
{
Desktop::Displays::Display d;
d.isMain = true;
d.scale = masterScale;
d.dpi = 0;
d.userArea = d.totalArea = Rectangle<int> (0, 0, 1024, 800);
return d;
}
void Desktop::Displays::findDisplays (const float masterScale)
{
JUCE_AUTORELEASEPOOL
@ -363,29 +398,14 @@ void Desktop::Displays::findDisplays (const float masterScale)
CGFloat mainScreenBottom = 0;
for (NSScreen* s in [NSScreen screens])
displays.add (getDisplayFromScreen (s, mainScreenBottom, masterScale));
if (displays.size() == 0) // this can apparently happen while rearranging monitors
{
Display d;
d.isMain = false;
if (mainScreenBottom == 0)
{
mainScreenBottom = [s frame].size.height;
d.isMain = true;
}
d.userArea = convertDisplayRect ([s visibleFrame], mainScreenBottom) / masterScale;
d.totalArea = convertDisplayRect ([s frame], mainScreenBottom) / masterScale;
d.scale = masterScale;
#if defined (MAC_OS_X_VERSION_10_7) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
if ([s respondsToSelector: @selector (backingScaleFactor)])
d.scale *= s.backingScaleFactor;
#endif
NSSize dpi = [[[s deviceDescription] objectForKey: NSDeviceResolution] sizeValue];
d.dpi = (dpi.width + dpi.height) / 2.0;
displays.add (d);
if (NSScreen* s = [NSScreen mainScreen])
displays.add (getDisplayFromScreen (s, mainScreenBottom, masterScale));
else
displays.add (getDummyScreen (masterScale));
}
}
}