piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6081 from ligfx/graphicsuseconfigchanged

Browse Source 
Qt: bold graphics settings on ConfigChanged, not EmulationStateChanged
This commit is contained in:
Leo Lam
2017-09-25 21:53:27 +02:00
committed by GitHub
parent 38a8d04c35 9245210c49
commit faced475df
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.cpp
View File

@ -16,7 +16,7 @@ GraphicsBool::GraphicsBool(const QString& label, const Config::ConfigInfo<bool>&
connect(this, &QCheckBox::toggled, this, &GraphicsBool::Update); connect(this, &QCheckBox::toggled, this, &GraphicsBool::Update);
setChecked(Config::Get(m_setting) ^ reverse); setChecked(Config::Get(m_setting) ^ reverse);
connect(&Settings::Instance(), &Settings::EmulationStateChanged, [this]() { connect(&Settings::Instance(), &Settings::ConfigChanged, [this] {
QFont bf = font(); QFont bf = font();
bf.setBold(Config::GetActiveLayerForConfig(m_setting) != Config::LayerType::Base); bf.setBold(Config::GetActiveLayerForConfig(m_setting) != Config::LayerType::Base);
setFont(bf); setFont(bf);

2
Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.cpp
View File

@ -15,7 +15,7 @@ GraphicsChoice::GraphicsChoice(const QStringList& options, const Config::ConfigI
&GraphicsChoice::Update); &GraphicsChoice::Update);
setCurrentIndex(Config::Get(m_setting)); setCurrentIndex(Config::Get(m_setting));
connect(&Settings::Instance(), &Settings::EmulationStateChanged, [this]() { connect(&Settings::Instance(), &Settings::ConfigChanged, [this] {
QFont bf = font(); QFont bf = font();
bf.setBold(Config::GetActiveLayerForConfig(m_setting) != Config::LayerType::Base); bf.setBold(Config::GetActiveLayerForConfig(m_setting) != Config::LayerType::Base);
setFont(bf); setFont(bf);

2
Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.cpp
View File

@ -19,7 +19,7 @@ GraphicsSlider::GraphicsSlider(int minimum, int maximum, const Config::ConfigInf
connect(this, &GraphicsSlider::valueChanged, this, &GraphicsSlider::Update); connect(this, &GraphicsSlider::valueChanged, this, &GraphicsSlider::Update);
connect(&Settings::Instance(), &Settings::EmulationStateChanged, [this]() { connect(&Settings::Instance(), &Settings::ConfigChanged, [this] {
QFont bf = font(); QFont bf = font();
bf.setBold(Config::GetActiveLayerForConfig(m_setting) != Config::LayerType::Base); bf.setBold(Config::GetActiveLayerForConfig(m_setting) != Config::LayerType::Base);
setFont(bf); setFont(bf);

5
Source/Core/DolphinQt2/Settings.cpp
View File

@ -7,12 +7,14 @@
#include <QSize> #include <QSize>
#include "AudioCommon/AudioCommon.h" #include "AudioCommon/AudioCommon.h"
#include "Common/Config/Config.h"
#include "Common/FileSearch.h" #include "Common/FileSearch.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "DolphinQt2/GameList/GameListModel.h" #include "DolphinQt2/GameList/GameListModel.h"
#include "DolphinQt2/QtUtils/QueueOnObject.h"
#include "DolphinQt2/Settings.h" #include "DolphinQt2/Settings.h"
#include "InputCommon/InputConfig.h" #include "InputCommon/InputConfig.h"
@ -21,6 +23,9 @@ Settings::Settings()
qRegisterMetaType<Core::State>(); qRegisterMetaType<Core::State>();
Core::SetOnStateChangedCallback( Core::SetOnStateChangedCallback(
[this](Core::State new_state) { emit EmulationStateChanged(new_state); }); [this](Core::State new_state) { emit EmulationStateChanged(new_state); });
Config::AddConfigChangedCallback(
[this] { QueueOnObject(this, [this] { emit ConfigChanged(); }); });
} }
Settings& Settings::Instance() Settings& Settings::Instance()

1
Source/Core/DolphinQt2/Settings.h
View File

@ -81,6 +81,7 @@ public:
GameListModel* GetGameListModel() const; GameListModel* GetGameListModel() const;
signals: signals:
void ConfigChanged();
void EmulationStateChanged(Core::State new_state); void EmulationStateChanged(Core::State new_state);
void ThemeChanged(); void ThemeChanged();
void PathAdded(const QString&); void PathAdded(const QString&);