eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-14 11:39:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed problem with full screen in Linux

Browse Source
This commit is contained in:
Tats
2014-04-29 16:45:03 -04:00
parent 5f9b7a6327
commit df73b0b631
4 changed files with 82 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
OutputGLWindow.cpp
View File

@@ -33,6 +33,9 @@ OutputGLWindow::OutputGLWindow(MainWindow* mainWindow, QWidget* parent, const QG
layout->setContentsMargins(0,0,0,0); // remove margin
layout->addWidget(canvas);
setLayout(layout);
// Save window geometry.
_geometry = saveGeometry();
}
void OutputGLWindow::closeEvent(QCloseEvent *event)
@@ -41,28 +44,65 @@ void OutputGLWindow::closeEvent(QCloseEvent *event)
event->accept();
}
void OutputGLWindow::fullscreen(bool is_fullscreen)
void OutputGLWindow::keyPressEvent(QKeyEvent *event)
{
if (is_fullscreen)
{
this->showFullScreen();
}
else
{
this->showNormal();
}
// Escape from full screen mode.
if (isFullScreen() && event->key() == Qt::Key_Escape)
{
setFullScreen(false);
emit fullScreenToggled(false);
}
else
QDialog::keyPressEvent(event);
}
void OutputGLWindow::mySetVisible(bool value)
{
this->setVisible(value);
if (value)
{
this->fullscreen(value);
}
}
//void OutputGLWindow::updateCanvas() {
// qDebug() << "Update output canvas" << endl;
// canvas->updateCanvas();
//}
void OutputGLWindow::setFullScreen(bool fullscreen)
{
// NOTE: The showFullScreen() method does not work well under Ubuntu Linux. The code below fixes the issue.
// Notice that there might be problems with the fullscreen in other OS / window managers. If so, please add
// the code to fix those issues here.
// See: http://qt-project.org/doc/qt-4.8/qwidget.html#showFullScreen
// Source: http://stackoverflow.com/questions/12645880/fullscreen-for-qdialog-from-within-mainwindow-only-working-sometimes
#ifdef Q_OS_UNIX
const QString session = QString(getenv("DESKTOP_SESSION")).toLower();
#endif
if (fullscreen)
{
// Save window geometry.
_geometry = saveGeometry();
// Move window to second screen before fullscreening it.
if (QApplication::desktop()->screenCount() > 1)
setGeometry(QApplication::desktop()->screenGeometry(1));
#ifdef Q_OS_UNIX
// Special case for Unity.
if (session == "ubuntu") {
setWindowState( windowState() | Qt::WindowFullScreen | Qt::WindowMaximized);
setWindowFlags(Qt::Dialog);
show();
} else {
showFullScreen();
}
#else
showFullScreen();
#endif
}
else
{
// Restore geometry of window to what it was before full screen call.
restoreGeometry(_geometry);
#ifdef Q_OS_UNIX
// Special case for Unity.
if (session == "ubuntu") {
setWindowState( windowState() & ~Qt::WindowFullScreen);
} else {
showNormal();
}
#else
showNormal();
#endif
}
}