Mercurial > hg > sonic-visualiser
diff main/MainWindow.cpp @ 1390:4c5533df5d72 levelpanwidget
Merge from branch 3.0-integration
author | Chris Cannam |
---|---|
date | Mon, 05 Dec 2016 17:03:09 +0000 |
parents | 05d35ce6ea72 7b058ba5fa67 |
children | 3e2dee09c10c |
line wrap: on
line diff
--- a/main/MainWindow.cpp Mon Dec 05 15:47:40 2016 +0000 +++ b/main/MainWindow.cpp Mon Dec 05 17:03:09 2016 +0000 @@ -1072,12 +1072,16 @@ menu->addSeparator(); +#ifndef Q_OS_MAC + // Only on non-Mac platforms -- on the Mac this interacts very + // badly with the "native" full-screen mode action = new QAction(tr("Go Full-Screen"), this); action->setShortcut(tr("F11")); action->setStatusTip(tr("Expand the pane area to the whole screen")); connect(action, SIGNAL(triggered()), this, SLOT(goFullScreen())); m_keyReference->registerShortcut(action); menu->addAction(action); +#endif } void