diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-09-21 17:29:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-21 17:29:24 +0200 |
| commit | 969a72faed2844bebdf38caa3293e05604db6e10 (patch) | |
| tree | c154cde836d4fac19b99ae8c8c74bd373b0e966d /Source/Core | |
| parent | 106539f346e94981febc45953b0a52cb47a1512e (diff) | |
| parent | 0b43e1bcf460c5bfb488acdcc885695152be0a25 (diff) | |
Merge pull request #6079 from spycrab/qt_fix_log
Qt: Fix log / log config window not being marked as hidden when closing
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt2/Config/LogConfigWidget.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/DolphinQt2/Config/LogConfigWidget.h | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinQt2/Config/LogWidget.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/DolphinQt2/Config/LogWidget.h | 4 |
4 files changed, 18 insertions, 0 deletions
diff --git a/Source/Core/DolphinQt2/Config/LogConfigWidget.cpp b/Source/Core/DolphinQt2/Config/LogConfigWidget.cpp index 326eb50812..e8a28140d4 100644 --- a/Source/Core/DolphinQt2/Config/LogConfigWidget.cpp +++ b/Source/Core/DolphinQt2/Config/LogConfigWidget.cpp @@ -196,3 +196,8 @@ void LogConfigWidget::SaveSettings() LogManager::GetInstance()->SetEnable(type, enabled); } } + +void LogConfigWidget::closeEvent(QCloseEvent*) +{ + Settings::Instance().SetLogConfigVisible(false); +} diff --git a/Source/Core/DolphinQt2/Config/LogConfigWidget.h b/Source/Core/DolphinQt2/Config/LogConfigWidget.h index 94a0d241b6..0158b997b2 100644 --- a/Source/Core/DolphinQt2/Config/LogConfigWidget.h +++ b/Source/Core/DolphinQt2/Config/LogConfigWidget.h @@ -7,6 +7,7 @@ #include <QDockWidget> class QCheckBox; +class QCloseEvent; class QListWidget; class QPushButton; class QRadioButton; @@ -19,6 +20,9 @@ public: explicit LogConfigWidget(QWidget* parent = nullptr); ~LogConfigWidget(); +protected: + void closeEvent(QCloseEvent* event) override; + private: void CreateWidgets(); void ConnectWidgets(); diff --git a/Source/Core/DolphinQt2/Config/LogWidget.cpp b/Source/Core/DolphinQt2/Config/LogWidget.cpp index d31203371e..e9293c22db 100644 --- a/Source/Core/DolphinQt2/Config/LogWidget.cpp +++ b/Source/Core/DolphinQt2/Config/LogWidget.cpp @@ -207,3 +207,8 @@ void LogWidget::Log(LogTypes::LOG_LEVELS level, const char* text) QString::fromStdString(color), QString::fromStdString(std::string(text).substr(TIMESTAMP_LENGTH)))); } + +void LogWidget::closeEvent(QCloseEvent*) +{ + Settings::Instance().SetLogVisible(false); +} diff --git a/Source/Core/DolphinQt2/Config/LogWidget.h b/Source/Core/DolphinQt2/Config/LogWidget.h index 193269d142..d116d8d02b 100644 --- a/Source/Core/DolphinQt2/Config/LogWidget.h +++ b/Source/Core/DolphinQt2/Config/LogWidget.h @@ -12,6 +12,7 @@ #include "Common/Logging/LogManager.h" class QCheckBox; +class QCloseEvent; class QComboBox; class QPushButton; class QVBoxLayout; @@ -25,6 +26,9 @@ public: explicit LogWidget(QWidget* parent = nullptr); ~LogWidget(); +protected: + void closeEvent(QCloseEvent*) override; + private: void UpdateLog(); void UpdateFont(); |
