Keep the current theme in LibraryWindow and pass it when needed.

This commit is contained in:
Luis Ángel San Martín 2018-09-07 12:50:48 +02:00 committed by Luis Ángel San Martín
parent 7f30709920
commit 0eebc9af92
2 changed files with 6 additions and 2 deletions

View File

@ -83,6 +83,8 @@
#include "trayicon_controller.h" #include "trayicon_controller.h"
#include "theme.h"
#include "QsLog.h" #include "QsLog.h"
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
@ -235,7 +237,7 @@ void LibraryWindow::doLayout()
//FINAL LAYOUT------------------------------------------------------------- //FINAL LAYOUT-------------------------------------------------------------
comicsViewsManager = new YACReaderComicsViewsManager(settings, this); comicsViewsManager = new YACReaderComicsViewsManager(settings, Theme::currentTheme(), this);
sHorizontal->addWidget(sideBar); sHorizontal->addWidget(sideBar);
#ifndef Q_OS_MAC #ifndef Q_OS_MAC

View File

@ -11,6 +11,8 @@
#include "yacreader_navigation_controller.h" #include "yacreader_navigation_controller.h"
#include "theme.h"
#include <future> #include <future>
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
@ -61,7 +63,6 @@ class ComicVineDialog;
class ComicsView; class ComicsView;
class ClassicComicsView; class ClassicComicsView;
class GridComicsView; class GridComicsView;
class ComicsViewTransition;
class EmptyFolderWidget; class EmptyFolderWidget;
class NoSearchResultsWidget; class NoSearchResultsWidget;
class EditShortcutsDialog; class EditShortcutsDialog;
@ -398,6 +399,7 @@ private:
QSize previousSize; QSize previousSize;
std::future<void> upgradeLibraryFuture; std::future<void> upgradeLibraryFuture;
Theme theme = Theme::currentTheme();
TrayIconController *trayIconController; TrayIconController *trayIconController;
}; };