Permalink
Browse files

Merge pull request #7157 from spycrab/qt_fix_options

Qt/Mapping: Fix "Options" entries disappearing
  • Loading branch information...
spycrab committed Jun 22, 2018
2 parents 77f6e50 + 308d4bb commit dfc09cc11cf334360fba86b7fc0d7ecf12ec0595
@@ -41,17 +41,8 @@ void GCPadEmu::CreateMainLayout()
CreateGroupBox(tr("Triggers"), Pad::GetGroup(GetPort(), PadGroup::Triggers)));
hbox_layout->addWidget(CreateGroupBox(tr("Rumble"), Pad::GetGroup(GetPort(), PadGroup::Rumble)));
// TODO: Get rid of this garbage once wx is removed
// Remove "Iterative Input"
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));
}
hbox_layout->addWidget(
CreateGroupBox(tr("Options"), Pad::GetGroup(GetPort(), PadGroup::Options)));
setLayout(m_main_layout);
}
@@ -58,12 +58,8 @@ void WiimoteEmuGeneral::CreateMainLayout()
vbox_layout->addWidget(CreateGroupBox(
tr("Rumble"), Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Rumble)));
// TODO: Get rid of this garbage once wx is removed
// Remove "Iterative Input"
auto* options_group = Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Options);
options_group->boolean_settings.pop_back();
vbox_layout->addWidget(CreateGroupBox(tr("Options"), options_group));
vbox_layout->addWidget(CreateGroupBox(
tr("Options"), Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Options)));
m_main_layout->addLayout(vbox_layout);

0 comments on commit dfc09cc

Please sign in to comment.