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

Qt/Mapping: Fix "Options" entries disappearing

This commit is contained in:
spycrab 2018-06-22 00:16:28 +02:00
parent 77f6e50493
commit 308d4bb670
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp
View File

@ -41,17 +41,8 @@ void GCPadEmu::CreateMainLayout()
CreateGroupBox(tr("Triggers"), Pad::GetGroup(GetPort(), PadGroup::Triggers))); CreateGroupBox(tr("Triggers"), Pad::GetGroup(GetPort(), PadGroup::Triggers)));
hbox_layout->addWidget(CreateGroupBox(tr("Rumble"), Pad::GetGroup(GetPort(), PadGroup::Rumble))); hbox_layout->addWidget(CreateGroupBox(tr("Rumble"), Pad::GetGroup(GetPort(), PadGroup::Rumble)));
// TODO: Get rid of this garbage once wx is removed hbox_layout->addWidget(
// Remove "Iterative Input" CreateGroupBox(tr("Options"), Pad::GetGroup(GetPort(), PadGroup::Options)));
auto* options_group = Pad::GetGroup(GetPort(), PadGroup::Options);
auto& bools = options_group->boolean_settings;
if (bools.size() > 1 || !options_group->numeric_settings.empty())
{
bools.pop_back();
hbox_layout->addWidget(CreateGroupBox(tr("Options"), options_group));
}
setLayout(m_main_layout); setLayout(m_main_layout);
} }

8
Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp
View File

@ -58,12 +58,8 @@ void WiimoteEmuGeneral::CreateMainLayout()
vbox_layout->addWidget(CreateGroupBox( vbox_layout->addWidget(CreateGroupBox(
tr("Rumble"), Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Rumble))); tr("Rumble"), Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Rumble)));
// TODO: Get rid of this garbage once wx is removed vbox_layout->addWidget(CreateGroupBox(
// Remove "Iterative Input" tr("Options"), Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Options)));
auto* options_group = Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Options);
options_group->boolean_settings.pop_back();
vbox_layout->addWidget(CreateGroupBox(tr("Options"), options_group));
m_main_layout->addLayout(vbox_layout); m_main_layout->addLayout(vbox_layout);