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

corregido bug que evitaba que la restauraci?n desde pantalla completa a maximizada no se hicese correctamente

Browse Source
This commit is contained in:
Luis Ángel San Martín 2013-04-30 19:52:18 +02:00
parent 7f1f98752d
commit 2cb4b753f7
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
YACReader/main_window_viewer.cpp
View File

@ -558,6 +558,8 @@ void MainWindowViewer::toggleFullScreen()
void MainWindowViewer::toFullScreen() void MainWindowViewer::toFullScreen()
{ {
fromMaximized = this->isMaximized();
hideToolBars(); hideToolBars();
viewer->hide(); viewer->hide();
viewer->fullscreen = true;//TODO, change by the right use of windowState(); viewer->fullscreen = true;//TODO, change by the right use of windowState();
@ -573,7 +575,11 @@ void MainWindowViewer::toNormal()
viewer->hide(); viewer->hide();
viewer->fullscreen = false;//TODO, change by the right use of windowState(); viewer->fullscreen = false;//TODO, change by the right use of windowState();
//viewer->hideMagnifyingGlass(); //viewer->hideMagnifyingGlass();
if(fromMaximized)
showMaximized();
else
showNormal(); showNormal();
if(Configuration::getConfiguration().getShowToolbars()) if(Configuration::getConfiguration().getShowToolbars())
showToolBars(); showToolBars();
viewer->show(); viewer->show();

1
YACReader/main_window_viewer.h
View File

@ -53,6 +53,7 @@ class YACReaderSliderAction;
bool fullscreen; bool fullscreen;
bool toolbars; bool toolbars;
bool alwaysOnTop; bool alwaysOnTop;
bool fromMaximized;
QString currentDirectory; QString currentDirectory;
QString currentDirectoryImgDest; QString currentDirectoryImgDest;

7
YACReaderLibrary/library_window.cpp
View File

@ -1169,6 +1169,8 @@ void LibraryWindow::toggleFullScreen()
void LibraryWindow::toFullScreen() void LibraryWindow::toFullScreen()
{ {
fromMaximized = this->isMaximized();
comicFlow->hide(); comicFlow->hide();
comicFlow->setSlideSize(slideSizeF); comicFlow->setSlideSize(slideSizeF);
comicFlow->setCenterIndex(comicFlow->centerIndex()); comicFlow->setCenterIndex(comicFlow->centerIndex());
@ -1199,6 +1201,9 @@ void LibraryWindow::toNormal()
libraryToolBar->show(); libraryToolBar->show();
comicFlow->show(); comicFlow->show();
if(fromMaximized)
showMaximized();
else
showNormal(); showNormal();
} }
@ -1479,5 +1484,5 @@ QString LibraryWindow::getFolderName(const QString & libraryName, qulonglong id)
void LibraryWindow::closeEvent ( QCloseEvent * event ) void LibraryWindow::closeEvent ( QCloseEvent * event )
{ {
settings->setValue(MAIN_WINDOW_GEOMETRY, saveGeometry()); settings->setValue(MAIN_WINDOW_GEOMETRY, saveGeometry());
settings->setValue(MAIN_WINDOW_STATE, saveState()); //settings->setValue(MAIN_WINDOW_STATE, saveState());
} }

2
YACReaderLibrary/library_window.h
View File

@ -50,6 +50,8 @@ private:
PropertiesDialog * propertiesDialog; PropertiesDialog * propertiesDialog;
bool fullscreen; bool fullscreen;
bool importedCovers; //if true, the library is read only (not updates,open comic or properties) bool importedCovers; //if true, the library is read only (not updates,open comic or properties)
bool fromMaximized;
//Ya no se usan proxies, el rendimiento de la BD es suficiente //Ya no se usan proxies, el rendimiento de la BD es suficiente
//YACReaderTreeSearch * proxyFilter; //YACReaderTreeSearch * proxyFilter;
//YACReaderSortComics * proxySort; //YACReaderSortComics * proxySort;