fixed fullscreen mode (QTBUG-41883)

This commit is contained in:
Luis Ángel San Martín
2015-01-24 18:23:29 +01:00
parent 92b58f70b6
commit f65a59090b
6 changed files with 59 additions and 10 deletions

View File

@ -888,35 +888,53 @@ void MainWindowViewer::toggleFullScreen()
Configuration::getConfiguration().setFullScreen(fullscreen = !fullscreen);
}
//QTBUG-41883
void MainWindowViewer::toFullScreen()
{
_size = size();
_pos = pos();
hide();
fromMaximized = this->isMaximized();
hideToolBars();
viewer->hide();
viewer->fullscreen = true;//TODO, change by the right use of windowState();
showFullScreen();
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
setWindowState(windowState() | Qt::WindowFullScreen);
resize(windowHandle()->screen()->size()-QSize(0,1));
viewer->show();
if(viewer->magnifyingGlassIsVisible())
viewer->showMagnifyingGlass();
show();
}
//QTBUG-41883
void MainWindowViewer::toNormal()
{
hide();
//show all
viewer->hide();
viewer->fullscreen = false;//TODO, change by the right use of windowState();
//viewer->hideMagnifyingGlass();
if(fromMaximized)
showMaximized();
else
showNormal();
setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
setWindowState(windowState() & ~Qt::WindowFullScreen);
resize(_size);
move(_pos);
if(fromMaximized)
showMaximized();
else
showNormal();
if(Configuration::getConfiguration().getShowToolbars())
showToolBars();
viewer->show();
viewer->show();
if(viewer->magnifyingGlassIsVisible())
viewer->showMagnifyingGlass();
viewer->showMagnifyingGlass();
show();
}
void MainWindowViewer::toggleToolBars()
{

View File

@ -74,6 +74,10 @@ class EditShortcutsDialog;
bool toolbars;
bool alwaysOnTop;
bool fromMaximized;
//QTBUG-41883
QSize _size;
QPoint _pos;
QString currentDirectory;
QString currentDirectoryImgDest;