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

try to act on system's maximization attempts to toggle fullscreen mode

Browse Source
This commit is contained in:
hjk
2009-01-19 15:49:47 +01:00
parent ed94fcd29a
commit 57a091ac8a
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -641,16 +641,18 @@ void MainWindow::registerDefaultActions()
mwindow->addAction(cmd, Constants::G_WINDOW_PANES); mwindow->addAction(cmd, Constants::G_WINDOW_PANES);
m_toggleSideBarAction->setEnabled(false); m_toggleSideBarAction->setEnabled(false);
#if !defined(Q_OS_MAC)
// Toggle Full Screen // Toggle Full Screen
m_toggleFullScreenAction = new QAction(tr("Toggle Fullscreen"), this); m_toggleFullScreenAction = new QAction(tr("Toggle Fullscreen"), this);
m_toggleFullScreenAction->setCheckable(true); m_toggleFullScreenAction->setCheckable(true);
m_toggleFullScreenAction->setChecked(true); m_toggleFullScreenAction->setChecked(false);
cmd = am->registerAction(m_toggleFullScreenAction, cmd = am->registerAction(m_toggleFullScreenAction,
Constants::TOGGLE_FULLSCREEN, m_globalContext); Constants::TOGGLE_FULLSCREEN, m_globalContext);
cmd->setDefaultKeySequence(QKeySequence("Ctrl+Shift+F11")); cmd->setDefaultKeySequence(QKeySequence("Ctrl+Shift+F11"));
mwindow->addAction(cmd, Constants::G_WINDOW_FULLSCREEN); mwindow->addAction(cmd, Constants::G_WINDOW_SIZE);
connect(m_toggleFullScreenAction, SIGNAL(toggled(bool)), connect(m_toggleFullScreenAction, SIGNAL(triggered(bool)),
this, SLOT(setFullScreen(bool))); this, SLOT(setFullScreen(bool)));
#endif
//About IDE Action //About IDE Action
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
@@ -928,13 +930,18 @@ void MainWindow::changeEvent(QEvent *e)
qDebug() << "main window activated"; qDebug() << "main window activated";
emit windowActivated(); emit windowActivated();
} }
#ifdef Q_OS_MAC
} else if (e->type() == QEvent::WindowStateChange) { } else if (e->type() == QEvent::WindowStateChange) {
#ifdef Q_OS_MAC
bool minimized = isMinimized(); bool minimized = isMinimized();
if (debugMainWindow) if (debugMainWindow)
qDebug() << "main window state changed to minimized=" << minimized; qDebug() << "main window state changed to minimized=" << minimized;
m_minimizeAction->setEnabled(!minimized); m_minimizeAction->setEnabled(!minimized);
m_zoomAction->setEnabled(!minimized); m_zoomAction->setEnabled(!minimized);
#else
QWindowStateChangeEvent *ev =
static_cast<QWindowStateChangeEvent *>(e);
bool isFullScreen = (ev->oldState() & Qt::WindowFullScreen) != 0;
m_toggleFullScreenAction->setChecked(!isFullScreen);
#endif #endif
} }
} }
@@ -1127,6 +1134,9 @@ QPrinter *MainWindow::printer() const
void MainWindow::setFullScreen(bool on) void MainWindow::setFullScreen(bool on)
{ {
if (bool(windowState() & Qt::WindowFullScreen) == on)
return;
if (on) { if (on) {
setWindowState(windowState() | Qt::WindowFullScreen); setWindowState(windowState() | Qt::WindowFullScreen);
//statusBar()->hide(); //statusBar()->hide();