mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00
Code Issues Releases Wiki Activity

Avoid tomahawkapp.h in .mm files

Browse Source
This commit is contained in:
Leo Franchi
2011-09-20 18:16:38 -04:00
parent 0f4b1bc91b
commit 6d61173bca
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mac/tomahawkapp_mac.h
View File

@@ -1,6 +1,6 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> === /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
* *
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org> * Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
* *
* Tomahawk is free software: you can redistribute it and/or modify * Tomahawk is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

26
src/mac/tomahawkapp_mac.mm
View File

@@ -1,6 +1,6 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> === /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
* *
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org> * Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
* *
* Tomahawk is free software: you can redistribute it and/or modify * Tomahawk is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
#include "macdelegate.h" #include "macdelegate.h"
#include "macshortcuthandler.h" #include "macshortcuthandler.h"
#include "config.h" #include "config.h"
#include "tomahawkwindow.h"
#include "AvailabilityMacros.h" #include "AvailabilityMacros.h"
@@ -41,14 +42,8 @@
#import <Sparkle/SUUpdater.h> #import <Sparkle/SUUpdater.h>
#endif #endif
#if defined(MAC_OS_X_VERSION_10_7)
#include "tomahawkapp.h"
#endif
#include <QDebug> #include <QDebug>
#include <QApplication>
// Capture global media keys on Mac (Cocoa only!)
// See: http://www.rogueamoeba.com/utm/2007/09/29/apple-keyboard-media-key-event-handling/
@interface MacApplication :NSApplication { @interface MacApplication :NSApplication {
AppDelegate* delegate_; AppDelegate* delegate_;
@@ -243,8 +238,17 @@ void Tomahawk::enableFullscreen()
{ {
#if defined(MAC_OS_X_VERSION_10_7) #if defined(MAC_OS_X_VERSION_10_7)
qDebug() << "Enabling Lion Full-screeen"; qDebug() << "Enabling Lion Full-screeen";
NSView *nsview = (NSView *)APP->mainWindow()->winId(); // Can't include tomahawkapp.h in a .mm file, pulls in infosystem.h which uses
NSWindow *nswindow = [nsview window]; // the objc keyword 'id'
[nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; foreach( QWidget* w, QApplication::topLevelWidgets() )
{
if ( qobject_cast< TomahawkWindow* >( w ) )
{
NSView *nsview = (NSView *)w->winId();
NSWindow *nswindow = [nsview window];
[nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
}
}
#endif #endif
} }