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

Qt/Mapping: Remove "Iterative Input" everywhere

Browse Source
This commit is contained in:
spycrab
2018-06-19 10:47:18 +02:00
parent 113f9767dd
commit ce126f1cfe
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp
View File

@ -35,14 +35,8 @@ void GCKeyboardEmu::CreateMainLayout()
CreateGroupBox(QStringLiteral(""), Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb4x))); CreateGroupBox(QStringLiteral(""), Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb4x)));
auto* vbox_layout = new QVBoxLayout(); auto* vbox_layout = new QVBoxLayout();
auto* options_box =
CreateGroupBox(tr("Options"), Keyboard::GetGroup(GetPort(), KeyboardGroup::Options));
options_box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
vbox_layout->addWidget( vbox_layout->addWidget(
CreateGroupBox(QStringLiteral(""), Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb5x))); CreateGroupBox(QStringLiteral(""), Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb5x)));
vbox_layout->addWidget(options_box);
m_main_layout->addLayout(vbox_layout); m_main_layout->addLayout(vbox_layout);

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

@ -13,6 +13,7 @@
#include "Core/HW/GCPadEmu.h" #include "Core/HW/GCPadEmu.h"
#include "InputCommon/ControllerEmu/Setting/BooleanSetting.h" #include "InputCommon/ControllerEmu/Setting/BooleanSetting.h"
#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
#include "InputCommon/InputConfig.h" #include "InputCommon/InputConfig.h"
GCPadEmu::GCPadEmu(MappingWindow* window) : MappingWidget(window) GCPadEmu::GCPadEmu(MappingWindow* window) : MappingWidget(window)
@ -43,10 +44,14 @@ void GCPadEmu::CreateMainLayout()
// TODO: Get rid of this garbage once wx is removed // TODO: Get rid of this garbage once wx is removed
// Remove "Iterative Input" // Remove "Iterative Input"
auto* options_group = Pad::GetGroup(GetPort(), PadGroup::Options); auto* options_group = Pad::GetGroup(GetPort(), PadGroup::Options);
auto& bools = options_group->boolean_settings;
bools.erase(bools.end() - 1);
hbox_layout->addWidget(CreateGroupBox(tr("Options"), options_group)); 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);
} }

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

@ -16,6 +16,7 @@
#include "DolphinQt2/Config/Mapping/WiimoteEmuExtension.h" #include "DolphinQt2/Config/Mapping/WiimoteEmuExtension.h"
#include "InputCommon/ControllerEmu/ControlGroup/Extension.h" #include "InputCommon/ControllerEmu/ControlGroup/Extension.h"
#include "InputCommon/ControllerEmu/Setting/BooleanSetting.h"
#include "InputCommon/InputConfig.h" #include "InputCommon/InputConfig.h"
WiimoteEmuGeneral::WiimoteEmuGeneral(MappingWindow* window, WiimoteEmuExtension* extension) WiimoteEmuGeneral::WiimoteEmuGeneral(MappingWindow* window, WiimoteEmuExtension* extension)
@ -56,8 +57,13 @@ void WiimoteEmuGeneral::CreateMainLayout()
vbox_layout->addWidget(extension); vbox_layout->addWidget(extension);
vbox_layout->addWidget(CreateGroupBox( vbox_layout->addWidget(CreateGroupBox(
tr("Rumble"), Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Rumble))); tr("Rumble"), Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Rumble)));
vbox_layout->addWidget(CreateGroupBox(
tr("Options"), Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Options))); // 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));
m_main_layout->addLayout(vbox_layout); m_main_layout->addLayout(vbox_layout);