mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-25 15:31:17 +01:00
Merge pull request #6079 from spycrab/qt_fix_log
Qt: Fix log / log config window not being marked as hidden when closing
This commit is contained in:
commit
969a72faed
@ -196,3 +196,8 @@ void LogConfigWidget::SaveSettings()
|
|||||||
LogManager::GetInstance()->SetEnable(type, enabled);
|
LogManager::GetInstance()->SetEnable(type, enabled);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void LogConfigWidget::closeEvent(QCloseEvent*)
|
||||||
|
{
|
||||||
|
Settings::Instance().SetLogConfigVisible(false);
|
||||||
|
}
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
#include <QDockWidget>
|
#include <QDockWidget>
|
||||||
|
|
||||||
class QCheckBox;
|
class QCheckBox;
|
||||||
|
class QCloseEvent;
|
||||||
class QListWidget;
|
class QListWidget;
|
||||||
class QPushButton;
|
class QPushButton;
|
||||||
class QRadioButton;
|
class QRadioButton;
|
||||||
@ -19,6 +20,9 @@ public:
|
|||||||
explicit LogConfigWidget(QWidget* parent = nullptr);
|
explicit LogConfigWidget(QWidget* parent = nullptr);
|
||||||
~LogConfigWidget();
|
~LogConfigWidget();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void closeEvent(QCloseEvent* event) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void CreateWidgets();
|
void CreateWidgets();
|
||||||
void ConnectWidgets();
|
void ConnectWidgets();
|
||||||
|
@ -207,3 +207,8 @@ void LogWidget::Log(LogTypes::LOG_LEVELS level, const char* text)
|
|||||||
QString::fromStdString(color),
|
QString::fromStdString(color),
|
||||||
QString::fromStdString(std::string(text).substr(TIMESTAMP_LENGTH))));
|
QString::fromStdString(std::string(text).substr(TIMESTAMP_LENGTH))));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void LogWidget::closeEvent(QCloseEvent*)
|
||||||
|
{
|
||||||
|
Settings::Instance().SetLogVisible(false);
|
||||||
|
}
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#include "Common/Logging/LogManager.h"
|
#include "Common/Logging/LogManager.h"
|
||||||
|
|
||||||
class QCheckBox;
|
class QCheckBox;
|
||||||
|
class QCloseEvent;
|
||||||
class QComboBox;
|
class QComboBox;
|
||||||
class QPushButton;
|
class QPushButton;
|
||||||
class QVBoxLayout;
|
class QVBoxLayout;
|
||||||
@ -25,6 +26,9 @@ public:
|
|||||||
explicit LogWidget(QWidget* parent = nullptr);
|
explicit LogWidget(QWidget* parent = nullptr);
|
||||||
~LogWidget();
|
~LogWidget();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void closeEvent(QCloseEvent*) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void UpdateLog();
|
void UpdateLog();
|
||||||
void UpdateFont();
|
void UpdateFont();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user