mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 21:14:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

merged default

Browse Source
This commit is contained in:
Luis Ángel San Martín
2016-12-12 21:27:59 +01:00
parent 5f6f5936a1 a3b9ff66f8
commit 75502caa43
27 changed files with 595 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
YACReaderLibrary/library_window.cpp
View File

@ -2022,6 +2022,48 @@ void LibraryWindow::toggleFullScreen()
fullscreen = !fullscreen;
}
#ifdef Q_OS_WIN //fullscreen mode in Windows for preventing this bug: QTBUG-41309 https://bugreports.qt.io/browse/QTBUG-41309
void LibraryWindow::toFullScreen()
{
fromMaximized = this->isMaximized();
sideBar->hide();
libraryToolBar->hide();
previousWindowFlags = windowFlags();
previousPos = pos();
previousSize = size();
showNormal();
setWindowFlags(previousWindowFlags | Qt::FramelessWindowHint);
const QRect r = windowHandle()->screen()->geometry();
move(r.x(), r.y());
resize(r.width(),r.height()+1);
show();
comicsViewsManager->comicsView->toFullScreen();
}
void LibraryWindow::toNormal()
{
sideBar->show();
libraryToolBar->show();
setWindowFlags(previousWindowFlags);
move(previousPos);
resize(previousSize);
show();
if(fromMaximized)
showMaximized();
comicsViewsManager->comicsView->toNormal();
}
#else
void LibraryWindow::toFullScreen()
{
fromMaximized = this->isMaximized();
@ -2057,6 +2099,8 @@ void LibraryWindow::toNormal()
}
#endif
void LibraryWindow::setSearchFilter(const YACReader::SearchModifiers modifier, QString filter)
{
if(!filter.isEmpty())

6
YACReaderLibrary/library_window.h
View File

@ -375,6 +375,12 @@ public slots:
void onAddComicsToLabel();
void setToolbarTitle(const QModelIndex & modelIndex);
void saveSelectedCoversTo();
private:
//fullscreen mode in Windows for preventing this bug: QTBUG-41309 https://bugreports.qt.io/browse/QTBUG-41309
Qt::WindowFlags previousWindowFlags;
QPoint previousPos;
QSize previousSize;
};
#endif

6
YACReaderLibrary/yacreader_comics_views_manager.cpp
View File

@ -12,6 +12,8 @@
#include "empty_reading_list_widget.h"
#include "no_search_results_widget.h"
#include "yacreader_sidebar.h"
//--
#include "yacreader_search_line_edit.h"
#include "options_dialog.h"
@ -71,6 +73,10 @@ QWidget * YACReaderComicsViewsManager::containerWidget()
void YACReaderComicsViewsManager::showComicsView()
{
comicsViewStack->setCurrentWidget(comicsView);
//BUG, ugly workaround for glitch when QOpenGLWidget (flow) is used just after any other widget in the views stack
//Somehow QOpenGLWidget is messing with the rendering of the side bar (wrong buffer swapping)
libraryWindow->sideBar->update();
}
void YACReaderComicsViewsManager::showEmptyFolderView()