From 61ac25bb7bb7fc28896ed35d2806cd53d77fbdec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Wed, 12 Sep 2018 10:25:25 +0200 Subject: [PATCH] Fix full screen button show/hide depending on the theme. --- YACReaderLibrary/yacreader_library_toolbar.cpp | 2 +- YACReaderLibrary/yacreader_main_toolbar.cpp | 6 +++--- YACReaderLibrary/yacreader_main_toolbar.h | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/YACReaderLibrary/yacreader_library_toolbar.cpp b/YACReaderLibrary/yacreader_library_toolbar.cpp index c53b06d7..40559f8e 100644 --- a/YACReaderLibrary/yacreader_library_toolbar.cpp +++ b/YACReaderLibrary/yacreader_library_toolbar.cpp @@ -102,7 +102,7 @@ YACReaderLibraryToolbar::YACReaderLibraryToolbar(QMainWindow *mainWindow, bool i macosxToolbar->attachToWindow(mainWindow->windowHandle()); #endif } else { - defaultToolbar = new YACReaderMainToolBar(mainWindow); + defaultToolbar = new YACReaderMainToolBar(!useNativeFullScreen, mainWindow); auto actualSearchEdit = new YACReaderSearchLineEdit(); searchEdit = new YACReaderLibrarySearchEdit(actualSearchEdit); diff --git a/YACReaderLibrary/yacreader_main_toolbar.cpp b/YACReaderLibrary/yacreader_main_toolbar.cpp index 62278c32..014e62d8 100644 --- a/YACReaderLibrary/yacreader_main_toolbar.cpp +++ b/YACReaderLibrary/yacreader_main_toolbar.cpp @@ -8,8 +8,8 @@ #include #include -YACReaderMainToolBar::YACReaderMainToolBar(QWidget *parent) - : QWidget(parent) +YACReaderMainToolBar::YACReaderMainToolBar(bool enableFullscreen, QWidget *parent) + : QWidget(parent), enableFullscreen(enableFullscreen) { mainLayout = new QHBoxLayout; @@ -69,7 +69,7 @@ YACReaderMainToolBar::YACReaderMainToolBar(QWidget *parent) mainLayout->addWidget(toggleComicsViewButton, 0, Qt::AlignVCenter); - if (!fullscreenButton->actions().isEmpty()) { + if (enableFullscreen) { addWideDivider(); mainLayout->addWidget(fullscreenButton, 0, Qt::AlignVCenter); } diff --git a/YACReaderLibrary/yacreader_main_toolbar.h b/YACReaderLibrary/yacreader_main_toolbar.h index 78e20b28..59a19acc 100644 --- a/YACReaderLibrary/yacreader_main_toolbar.h +++ b/YACReaderLibrary/yacreader_main_toolbar.h @@ -14,7 +14,7 @@ class YACReaderMainToolBar : public QWidget { Q_OBJECT public: - explicit YACReaderMainToolBar(QWidget *parent = nullptr); + explicit YACReaderMainToolBar(bool enableFullscreen, QWidget *parent = nullptr); QSize sizeHint() const override; QToolButton *backButton; @@ -35,6 +35,8 @@ private: void paintEvent(QPaintEvent *) override; void resizeEvent(QResizeEvent *) override; + bool enableFullscreen; + QHBoxLayout *mainLayout; QLabel *currentFolder;