|
|
|
@@ -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
|
|
|
|
|