From e107f2a304cea52068e95f371f39d8edcb436c17 Mon Sep 17 00:00:00 2001 From: luddens Date: Sat, 4 Jan 2020 15:28:41 +0100 Subject: [PATCH 1/2] add a getter for the m_currentSideType --- src/kiwixapp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/kiwixapp.h b/src/kiwixapp.h index cf4ce32..3eae0a8 100644 --- a/src/kiwixapp.h +++ b/src/kiwixapp.h @@ -77,6 +77,7 @@ public: QString getLibraryDirectory() { return m_libraryDirectory; }; kiwix::KiwixServe* getLocalServer() { return mp_server; } SettingsManager* getSettingsManager() { return &m_settingsManager; }; + SideBarType getSideType() { return m_currentSideType; } bool isCurrentArticleBookmarked(); From 21e1c1145d3e77fc9c8d6794e13534a4ef89f987 Mon Sep 17 00:00:00 2001 From: luddens Date: Sat, 4 Jan 2020 15:31:26 +0100 Subject: [PATCH 2/2] Sidebar is not hidden if the sidebar displays the readinglist --- ChangeLog | 4 ++++ src/tabbar.cpp | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9e0fefc..1775f40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +kiwix-desktop rc5 +================= + * Readinglist doesn't close automatically + kiwix-desktop rc4 ================= diff --git a/src/tabbar.cpp b/src/tabbar.cpp index f6c9595..f54d58d 100644 --- a/src/tabbar.cpp +++ b/src/tabbar.cpp @@ -274,7 +274,9 @@ void TabBar::onCurrentChanged(int index) emit webActionEnabledChanged(QWebEnginePage::Back, view->isWebActionEnabled(QWebEnginePage::Back)); emit webActionEnabledChanged(QWebEnginePage::Forward, view->isWebActionEnabled(QWebEnginePage::Forward)); emit libraryPageDisplayed(false); - KiwixApp::instance()->setSideBar(KiwixApp::NONE); + if (KiwixApp::instance()->getSideType() == KiwixApp::CONTENTMANAGER_BAR) { + KiwixApp::instance()->setSideBar(KiwixApp::NONE); + } QTimer::singleShot(0, [=](){emit currentTitleChanged(view->title());}); } else { emit webActionEnabledChanged(QWebEnginePage::Back, false);