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

Added a _setFullScreen() method + renamed _is_fullscreen to _isFullScreen (camelCase).

Browse Source
This commit is contained in:
Tats
2016-12-29 13:43:00 -06:00
parent d4c17e2c3a
commit 4180ed602b
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
OutputGLWindow.cpp
View File

@@ -39,7 +39,8 @@ OutputGLWindow:: OutputGLWindow(QWidget* parent, const MapperGLCanvas* canvas_)
setLayout(layout);
setCanvasDisplayCrosshair(false); // default
this->_is_fullscreen = false;
_isFullScreen = false;
_preferredScreen = QApplication::screens().size() - 1;
}
@@ -65,24 +66,8 @@ OutputGLWindow:: OutputGLWindow(QWidget* parent, const MapperGLCanvas* canvas_)
void OutputGLWindow::setFullScreen(bool fullscreen)
{
if (fullscreen)
{
_updateToPreferredScreen();
#ifdef Q_OS_LINUX
// The problem related to the full screen on linux seems to be resolved with Qt 5.5 on Debian.
// However this still seems to be needed on Ubuntu 15.10.
// Fix source:
// http://stackoverflow.com/questions/12645880/fullscreen-for-qdialog-from-within-mainwindow-only-working-sometimes
setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
#endif
showFullScreen();
}
else
{
hide();
}
this->_is_fullscreen = fullscreen;
}
_setFullScreen(fullscreen);
_isFullScreen = fullscreen;
void OutputGLWindow::_updateToPreferredScreen()
{
@@ -96,7 +81,7 @@ void OutputGLWindow::_updateToPreferredScreen()
void OutputGLWindow::setCanvasDisplayCrosshair(bool crosshair)
{
canvas->setDisplayCrosshair(crosshair);
setCursor(crosshair || this->_is_fullscreen ? Qt::BlankCursor : Qt::ArrowCursor);
setCursor(crosshair || this->_isFullScreen ? Qt::BlankCursor : Qt::ArrowCursor);
qDebug() << "Crosshair " << crosshair;
}
@@ -115,4 +100,24 @@ void OutputGLWindow::setPreferredScreen(int screen)
}
void OutputGLWindow::_setFullScreen(bool fullscreen)
{
if (fullscreen)
{
_updateToPreferredScreen();
#ifdef Q_OS_LINUX
// The problem related to the full screen on linux seems to be resolved with Qt 5.5 on Debian.
// However this still seems to be needed on Ubuntu 15.10.
// Fix source:
// http://stackoverflow.com/questions/12645880/fullscreen-for-qdialog-from-within-mainwindow-only-working-sometimes
setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
#endif
showFullScreen();
}
else
{
hide();
}
}
}