d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow close events from the session manager (#353)

Browse source
This commit is contained in:
Konstantinos Sideris 2018-07-11 20:55:13 +03:00
parent 80ebe3f29d
commit 363e3735f1
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/MainWindow.h
View file

@ -119,6 +119,8 @@ private:
void restoreWindowSize(); void restoreWindowSize();
//! Check if there is an open dialog. //! Check if there is an open dialog.
bool hasActiveDialogs() const; bool hasActiveDialogs() const;
//! Check if the current page supports the "minimize to tray" functionality.
bool pageSupportsTray() const;
static MainWindow *instance_; static MainWindow *instance_;

14
src/MainWindow.cc
View file

@ -277,11 +277,8 @@ MainWindow::showChatPage()
void void
MainWindow::closeEvent(QCloseEvent *event) MainWindow::closeEvent(QCloseEvent *event)
{ {
// Decide whether or not we should enable tray for the current page. if (!qApp->isSavingSession() && isVisible() && pageSupportsTray() &&
bool pageSupportsTray = userSettings_->isTrayEnabled()) {
!welcome_page_->isVisible() && !login_page_->isVisible() && !register_page_->isVisible();
if (isVisible() && pageSupportsTray && userSettings_->isTrayEnabled()) {
event->ignore(); event->ignore();
hide(); hide();
} }
@ -505,3 +502,10 @@ MainWindow::hasActiveDialogs() const
(!createRoomModal_.isNull() && createRoomModal_->isVisible()) || (!createRoomModal_.isNull() && createRoomModal_->isVisible()) ||
(!logoutModal_.isNull() && logoutModal_->isVisible()); (!logoutModal_.isNull() && logoutModal_->isVisible());
} }
bool
MainWindow::pageSupportsTray() const
{
return !welcome_page_->isVisible() && !login_page_->isVisible() &&
!register_page_->isVisible();
}