ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7449 from amaiorano/fix-extensions-combo-update-on-reset-defaults 

Fix extensions combo update on reset defaults
This commit is contained in:
Tilka 2018-10-14 02:22:54 +01:00 committed by GitHub
parent 9a1f259626 f257630c0a
commit e18fbb9bd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/DolphinQt/Config/Mapping/WiimoteEmuGeneral.cpp
View File

@ -13,6 +13,7 @@
#include "Core/HW/Wiimote.h" #include "Core/HW/Wiimote.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "DolphinQt/Config/Mapping/MappingWindow.h"
#include "DolphinQt/Config/Mapping/WiimoteEmuExtension.h" #include "DolphinQt/Config/Mapping/WiimoteEmuExtension.h"
#include "InputCommon/ControllerEmu/ControlGroup/Extension.h" #include "InputCommon/ControllerEmu/ControlGroup/Extension.h"
@ -23,7 +24,7 @@ WiimoteEmuGeneral::WiimoteEmuGeneral(MappingWindow* window, WiimoteEmuExtension*
: MappingWidget(window), m_extension_widget(extension) : MappingWidget(window), m_extension_widget(extension)
{ {
CreateMainLayout(); CreateMainLayout();
Connect(); Connect(window);
} }
void WiimoteEmuGeneral::CreateMainLayout() void WiimoteEmuGeneral::CreateMainLayout()
@ -66,10 +67,11 @@ void WiimoteEmuGeneral::CreateMainLayout()
setLayout(m_main_layout); setLayout(m_main_layout);
} }
void WiimoteEmuGeneral::Connect() void WiimoteEmuGeneral::Connect(MappingWindow* window)
{ {
connect(m_extension_combo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), connect(m_extension_combo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this, &WiimoteEmuGeneral::OnAttachmentChanged); this, &WiimoteEmuGeneral::OnAttachmentChanged);
connect(window, &MappingWindow::Update, this, &WiimoteEmuGeneral::Update);
} }
void WiimoteEmuGeneral::OnAttachmentChanged(int extension) void WiimoteEmuGeneral::OnAttachmentChanged(int extension)
@ -92,14 +94,17 @@ void WiimoteEmuGeneral::OnAttachmentChanged(int extension)
SaveSettings(); SaveSettings();
} }
void WiimoteEmuGeneral::LoadSettings() void WiimoteEmuGeneral::Update()
{ {
auto* ce_extension = static_cast<ControllerEmu::Extension*>( auto* ce_extension = static_cast<ControllerEmu::Extension*>(
Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Extension)); Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Extension));
m_extension_combo->setCurrentIndex(ce_extension->switch_extension); m_extension_combo->setCurrentIndex(ce_extension->switch_extension);
OnAttachmentChanged(ce_extension->switch_extension); }
void WiimoteEmuGeneral::LoadSettings()
{
Update();
Wiimote::LoadConfig(); Wiimote::LoadConfig();
} }

3
Source/Core/DolphinQt/Config/Mapping/WiimoteEmuGeneral.h
View File

@ -22,8 +22,9 @@ private:
void LoadSettings() override; void LoadSettings() override;
void SaveSettings() override; void SaveSettings() override;
void CreateMainLayout(); void CreateMainLayout();
void Connect(); void Connect(MappingWindow* window);
void OnAttachmentChanged(int index); void OnAttachmentChanged(int index);
void Update();
// Main // Main
QHBoxLayout* m_main_layout; QHBoxLayout* m_main_layout;