From 667ee75d662d7d080c02e43856bad6512b0cab23 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sat, 8 Sep 2018 15:50:35 +0300 Subject: [PATCH] Show sidebar after initial sync fixes #412 --- src/ChatPage.cpp | 2 +- src/ChatPage.h | 2 +- src/MainWindow.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp index 63b2e409..49e37b92 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp @@ -1320,7 +1320,7 @@ ChatPage::showSideBars() top_bar_->disableBackButton(); } -int +uint64_t ChatPage::timelineWidth() { int sidebarWidth = sideBar_->size().width(); diff --git a/src/ChatPage.h b/src/ChatPage.h index 2000b9e5..dc30e497 100644 --- a/src/ChatPage.h +++ b/src/ChatPage.h @@ -67,7 +67,7 @@ public: void deleteConfigs(); //! Calculate the width of the message timeline. - int timelineWidth(); + uint64_t timelineWidth(); bool isSideBarExpanded(); //! Hide the room & group list (if it was visible). void hideSideBars(); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 95c56554..e6e75ee1 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -181,8 +181,8 @@ MainWindow::resizeEvent(QResizeEvent *event) void MainWindow::adjustSideBars() { - const int timelineWidth = chat_page_->timelineWidth(); - const int minAvailableWidth = + const uint64_t timelineWidth = chat_page_->timelineWidth(); + const uint64_t minAvailableWidth = conf::sideBarCollapsePoint + ui::sidebar::CommunitiesSidebarSize; if (timelineWidth < minAvailableWidth && !chat_page_->isSideBarExpanded()) {