mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Some workarounds to avoid triggering the new Xcode thread checker when using openGL

Browse source
This commit is contained in:
jules 2017-11-29 10:14:41 +00:00
parent ea81467377
commit 25fe3ee392
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
View file

@ -371,12 +371,7 @@ public:
bool isKioskMode() const override
{
#if defined (MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
if (hasNativeTitleBar() && ([window styleMask] & NSWindowStyleMaskFullScreen) != 0)
return true;
#endif
return ComponentPeer::isKioskMode();
return isWindowInKioskMode || ComponentPeer::isKioskMode();
}
static bool isWindowAtPoint (NSWindow* w, NSPoint screenPoint)
@ -441,10 +436,18 @@ public:
{
if (hasNativeTitleBar())
{
#if defined (MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
isWindowInKioskMode = (([window styleMask] & NSWindowStyleMaskFullScreen) != 0);
#endif
auto screen = getFrameSize().subtractedFrom (component.getParentMonitorArea());
fullScreen = component.getScreenBounds().expanded (2, 2).contains (screen);
}
else
{
isWindowInKioskMode = false;
}
}
bool hasNativeTitleBar() const
@ -1353,6 +1356,7 @@ public:
NSWindow* window = nil;
NSView* view = nil;
bool isSharedWindow = false, fullScreen = false;
bool isWindowInKioskMode = false;
#if USE_COREGRAPHICS_RENDERING
bool usingCoreGraphics = true;
#else

7
modules/juce_opengl/opengl/juce_OpenGLContext.cpp
View file

@ -143,7 +143,10 @@ public:
}
//==============================================================================
void paint (Graphics&) override {}
void paint (Graphics&) override
{
updateViewportSize (false);
}
bool invalidateAll() override
{
@ -229,8 +232,6 @@ public:
if (shouldExit())
return false;
updateViewportSize (false);
}
if (! context.makeActive())