Fix full screen button show/hide depending on the theme.

This commit is contained in:
Luis Ángel San Martín 2018-09-12 10:25:25 +02:00 committed by Luis Ángel San Martín
parent e7922a0e51
commit 61ac25bb7b
3 changed files with 7 additions and 5 deletions

View File

@ -102,7 +102,7 @@ YACReaderLibraryToolbar::YACReaderLibraryToolbar(QMainWindow *mainWindow, bool i
macosxToolbar->attachToWindow(mainWindow->windowHandle()); macosxToolbar->attachToWindow(mainWindow->windowHandle());
#endif #endif
} else { } else {
defaultToolbar = new YACReaderMainToolBar(mainWindow); defaultToolbar = new YACReaderMainToolBar(!useNativeFullScreen, mainWindow);
auto actualSearchEdit = new YACReaderSearchLineEdit(); auto actualSearchEdit = new YACReaderSearchLineEdit();
searchEdit = new YACReaderLibrarySearchEdit(actualSearchEdit); searchEdit = new YACReaderLibrarySearchEdit(actualSearchEdit);

View File

@ -8,8 +8,8 @@
#include <QPaintEvent> #include <QPaintEvent>
#include <QAction> #include <QAction>
YACReaderMainToolBar::YACReaderMainToolBar(QWidget *parent) YACReaderMainToolBar::YACReaderMainToolBar(bool enableFullscreen, QWidget *parent)
: QWidget(parent) : QWidget(parent), enableFullscreen(enableFullscreen)
{ {
mainLayout = new QHBoxLayout; mainLayout = new QHBoxLayout;
@ -69,7 +69,7 @@ YACReaderMainToolBar::YACReaderMainToolBar(QWidget *parent)
mainLayout->addWidget(toggleComicsViewButton, 0, Qt::AlignVCenter); mainLayout->addWidget(toggleComicsViewButton, 0, Qt::AlignVCenter);
if (!fullscreenButton->actions().isEmpty()) { if (enableFullscreen) {
addWideDivider(); addWideDivider();
mainLayout->addWidget(fullscreenButton, 0, Qt::AlignVCenter); mainLayout->addWidget(fullscreenButton, 0, Qt::AlignVCenter);
} }

View File

@ -14,7 +14,7 @@ class YACReaderMainToolBar : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit YACReaderMainToolBar(QWidget *parent = nullptr); explicit YACReaderMainToolBar(bool enableFullscreen, QWidget *parent = nullptr);
QSize sizeHint() const override; QSize sizeHint() const override;
QToolButton *backButton; QToolButton *backButton;
@ -35,6 +35,8 @@ private:
void paintEvent(QPaintEvent *) override; void paintEvent(QPaintEvent *) override;
void resizeEvent(QResizeEvent *) override; void resizeEvent(QResizeEvent *) override;
bool enableFullscreen;
QHBoxLayout *mainLayout; QHBoxLayout *mainLayout;
QLabel *currentFolder; QLabel *currentFolder;