mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Merge pull request #3702
Vincas Dargis (1): fix(widget): do not block logout on Linux desktop environments v2
This commit is contained in:
commit
077a844461
|
@ -568,11 +568,11 @@ void Widget::moveEvent(QMoveEvent *event)
|
|||
QWidget::moveEvent(event);
|
||||
}
|
||||
|
||||
void Widget::hideEvent(QHideEvent *event)
|
||||
void Widget::closeEvent(QCloseEvent *event)
|
||||
{
|
||||
if (Settings::getInstance().getShowSystemTray() && Settings::getInstance().getCloseToTray())
|
||||
{
|
||||
QWidget::hideEvent(event);
|
||||
QWidget::closeEvent(event);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -583,7 +583,7 @@ void Widget::hideEvent(QHideEvent *event)
|
|||
}
|
||||
saveWindowGeometry();
|
||||
saveSplitterGeometry();
|
||||
QWidget::hideEvent(event);
|
||||
QWidget::closeEvent(event);
|
||||
qApp->quit();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -161,7 +161,7 @@ signals:
|
|||
protected:
|
||||
virtual bool eventFilter(QObject *obj, QEvent *event) final override;
|
||||
virtual bool event(QEvent * e) final override;
|
||||
virtual void hideEvent(QHideEvent *event) final override;
|
||||
virtual void closeEvent(QCloseEvent *event) final override;
|
||||
virtual void changeEvent(QEvent *event) final override;
|
||||
virtual void resizeEvent(QResizeEvent *event) final override;
|
||||
virtual void moveEvent(QMoveEvent *event) final override;
|
||||
|
|
Loading…
Reference in New Issue
Block a user