mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

limited QTBUG-41883 patch scope to Windows

Browse Source
This commit is contained in:
Luis Ángel San Martín 2015-02-10 19:47:40 +01:00
parent 9730e6daeb
commit b3452f9b8b
2 changed files with 78 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
YACReader/main_window_viewer.cpp
View File

@ -889,6 +889,7 @@ void MainWindowViewer::toggleFullScreen()
} }
//QTBUG-41883 //QTBUG-41883
#ifdef Q_OS_WIN
void MainWindowViewer::toFullScreen() void MainWindowViewer::toFullScreen()
{ {
_size = size(); _size = size();
@ -936,6 +937,42 @@ void MainWindowViewer::toNormal()
show(); show();
} }
#else
void MainWindowViewer::toFullScreen()
{
fromMaximized = this->isMaximized();
hideToolBars();
viewer->hide();
viewer->fullscreen = true;//TODO, change by the right use of windowState();
showFullScreen();
viewer->show();
if(viewer->magnifyingGlassIsVisible())
viewer->showMagnifyingGlass();
}
void MainWindowViewer::toNormal()
{
//show all
viewer->hide();
viewer->fullscreen = false;//TODO, change by the right use of windowState();
//viewer->hideMagnifyingGlass();
if(fromMaximized)
showMaximized();
else
showNormal();
if(Configuration::getConfiguration().getShowToolbars())
showToolBars();
viewer->show();
if(viewer->magnifyingGlassIsVisible())
viewer->showMagnifyingGlass();
}
#endif
void MainWindowViewer::toggleToolBars() void MainWindowViewer::toggleToolBars()
{ {
toolbars?hideToolBars():showToolBars(); toolbars?hideToolBars():showToolBars();

41
YACReaderLibrary/library_window.cpp
View File

@ -2083,6 +2083,8 @@ void LibraryWindow::toggleFullScreen()
fullscreen = !fullscreen; fullscreen = !fullscreen;
} }
#ifdef Q_OS_WIN
//QTBUG-41883 //QTBUG-41883
void LibraryWindow::toFullScreen() void LibraryWindow::toFullScreen()
{ {
@ -2137,6 +2139,45 @@ void LibraryWindow::toNormal()
} }
#else
void LibraryWindow::toFullScreen()
{
fromMaximized = this->isMaximized();
sideBar->hide();
libraryToolBar->hide();
comicsView->toFullScreen();
showFullScreen();
}
void LibraryWindow::toNormal()
{
sideBar->show();
comicsView->toNormal();
if(fromMaximized)
showMaximized();
else
showNormal();
#ifdef Q_OS_MAC
QTimer * timer = new QTimer();
timer->setSingleShot(true);
timer->start();
connect(timer,SIGNAL(timeout()),libraryToolBar,SLOT(show()));
connect(timer,SIGNAL(timeout()),timer,SLOT(deleteLater()));
#else
libraryToolBar->show();
#endif
}
#endif
void LibraryWindow::setSearchFilter(const YACReader::SearchModifiers modifier, QString filter) void LibraryWindow::setSearchFilter(const YACReader::SearchModifiers modifier, QString filter)
{ {
if(!filter.isEmpty()) if(!filter.isEmpty())