StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3687

Browse Source 
Vincas Dargis (1):
      fix(widget): do not block logout on Linux desktop environments
This commit is contained in:
Diadlo 2016-09-06 16:12:16 +03:00
commit 191fc15b9f
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/widget/widget.cpp
View File

@ -568,12 +568,11 @@ void Widget::moveEvent(QMoveEvent *event)
QWidget::moveEvent(event);
}
void Widget::closeEvent(QCloseEvent *event)
void Widget::hideEvent(QHideEvent *event)
{
if (Settings::getInstance().getShowSystemTray() && Settings::getInstance().getCloseToTray())
{
event->ignore();
this->hide();
QWidget::hideEvent(event);
}
else
{
@ -584,7 +583,7 @@ void Widget::closeEvent(QCloseEvent *event)
}
saveWindowGeometry();
saveSplitterGeometry();
QWidget::closeEvent(event);
QWidget::hideEvent(event);
qApp->quit();
}
}

2
src/widget/widget.h
View File

@ -161,7 +161,7 @@ signals:
protected:
virtual bool eventFilter(QObject *obj, QEvent *event) final override;
virtual bool event(QEvent * e) final override;
virtual void closeEvent(QCloseEvent *event) final override;
virtual void hideEvent(QHideEvent *event) final override;
virtual void changeEvent(QEvent *event) final override;
virtual void resizeEvent(QResizeEvent *event) final override;
virtual void moveEvent(QMoveEvent *event) final override;