Enable room switcher only in the chat view (mujx#251)

vurpo · Feb 26, 2018 · eb1d954 · eb1d954
1 parent dc1cedd
commit eb1d954
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/include/MainWindow.h b/include/MainWindow.h
@@ -83,6 +83,8 @@ private slots:
 private:
         bool hasActiveUser();
         void restoreWindowSize();
+        //! Check if there is an open dialog.
+        bool hasActiveDialogs() const;
 
         static MainWindow *instance_;
 

diff --git a/src/MainWindow.cc b/src/MainWindow.cc
@@ -118,7 +118,8 @@ MainWindow::MainWindow(QWidget *parent)
 
         QShortcut *quickSwitchShortcut = new QShortcut(QKeySequence("Ctrl+K"), this);
         connect(quickSwitchShortcut, &QShortcut::activated, this, [this]() {
-                chat_page_->showQuickSwitcher();
+                if (chat_page_->isVisible() && !hasActiveDialogs())
+                        chat_page_->showQuickSwitcher();
         });
 
         QSettings settings;
@@ -289,3 +290,10 @@ MainWindow::showOverlayProgressBar()
                 progressModal_->show();
         }
 }
+
+bool
+MainWindow::hasActiveDialogs() const
+{
+        return (!leaveRoomModal_.isNull() && leaveRoomModal_->isVisible()) ||
+               (!progressModal_.isNull() && progressModal_->isVisible());
+}