feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.6'

Browse Source
This commit is contained in:
Eike Ziller
2012-10-22 11:17:09 +02:00
parent 68a7861263 fbf6a8da75
commit 021b64b5df
48 changed files with 45114 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/coreplugin/macfullscreen.mm
View File

@@ -36,14 +36,12 @@
#include <QSysInfo>
#include <qglobal.h>
#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_6
enum {
NSWindowCollectionBehaviorFullScreenPrimary = (1 << 7)
Qtc_NSWindowCollectionBehaviorFullScreenPrimary = (1 << 7)
};
static const NSString *NSWindowDidEnterFullScreenNotification = @"NSWindowDidEnterFullScreenNotification";
static const NSString *NSWindowDidExitFullScreenNotification = @"NSWindowDidExitFullScreenNotification";
#endif
static NSString *Qtc_NSWindowDidEnterFullScreenNotification = @"NSWindowDidEnterFullScreenNotification";
static NSString *Qtc_NSWindowDidExitFullScreenNotification = @"NSWindowDidExitFullScreenNotification";
@interface WindowObserver : NSObject {
Core::Internal::MainWindow *window;
@@ -86,11 +84,7 @@ using namespace Core::Internal;
bool MacFullScreen::supportsFullScreen()
{
#if QT_VERSION >= 0x040800
return QSysInfo::MacintoshVersion >= QSysInfo::MV_LION;
#else
return QSysInfo::MacintoshVersion >= 0x0009; /* MV_LION not defined */
#endif
}
void MacFullScreen::addFullScreen(MainWindow *window)
@@ -98,15 +92,15 @@ void MacFullScreen::addFullScreen(MainWindow *window)
if (supportsFullScreen()) {
NSView *nsview = (NSView *) window->winId();
NSWindow *nswindow = [nsview window];
[nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
[nswindow setCollectionBehavior:Qtc_NSWindowCollectionBehaviorFullScreenPrimary];
if (observer == nil)
observer = [[WindowObserver alloc] initWithMainWindow:window];
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
[nc addObserver:observer selector:@selector(notifyDidEnterFullScreen:)
name:NSWindowDidEnterFullScreenNotification object:nswindow];
name:Qtc_NSWindowDidEnterFullScreenNotification object:nswindow];
[nc addObserver:observer selector:@selector(notifyDidExitFullScreen:)
name:NSWindowDidExitFullScreenNotification object:nswindow];
name:Qtc_NSWindowDidExitFullScreenNotification object:nswindow];
}
}