ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix fallback binding layout not including motors

This commit is contained in:
Stenzek 2024-12-01 19:23:38 +10:00
parent aff623b772
commit 4aa9857c53
No known key found for this signature in database
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/duckstation-qt/controllerbindingwidgets.cpp
View File

@ -426,6 +426,41 @@ void ControllerBindingWidget::createBindingWidgets(QWidget* parent)
} }
} }
} }
if (m_controller_info->vibration_caps != Controller::VibrationCapabilities::NoVibration)
{
const bool dual_motors = (m_controller_info->vibration_caps == Controller::VibrationCapabilities::LargeSmallMotors);
if (!axis_gbox)
{
axis_gbox = new QGroupBox(tr("Axes"), scrollarea_widget);
axis_layout = new QGridLayout(axis_gbox);
}
QGroupBox* gbox = new QGroupBox(dual_motors ? tr("Large Motor") : tr("Vibration"), axis_gbox);
QVBoxLayout* temp = new QVBoxLayout(gbox);
InputVibrationBindingWidget* widget =
new InputVibrationBindingWidget(gbox, getDialog(), getConfigSection(), dual_motors ? "LargeMotor" : "Motor");
temp->addWidget(widget);
axis_layout->addWidget(gbox, row, column);
if ((++column) == NUM_AXIS_COLUMNS)
{
column = 0;
row++;
}
if (m_controller_info->vibration_caps == Controller::VibrationCapabilities::LargeSmallMotors)
{
gbox = new QGroupBox(tr("Small Motor"), axis_gbox);
temp = new QVBoxLayout(gbox);
widget = new InputVibrationBindingWidget(gbox, getDialog(), getConfigSection(), "SmallMotor");
temp->addWidget(widget);
axis_layout->addWidget(gbox, row, column);
if ((++column) == NUM_AXIS_COLUMNS)
{
column = 0;
row++;
}
}
}
if (axis_gbox) if (axis_gbox)
axis_layout->addItem(new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding), ++row, 0); axis_layout->addItem(new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding), ++row, 0);
@ -467,10 +502,9 @@ void ControllerBindingWidget::createBindingWidgets(QWidget* parent)
QHBoxLayout* layout = new QHBoxLayout(scrollarea_widget); QHBoxLayout* layout = new QHBoxLayout(scrollarea_widget);
if (axis_gbox) if (axis_gbox)
layout->addWidget(axis_gbox); layout->addWidget(axis_gbox, 1);
if (button_gbox) if (button_gbox)
layout->addWidget(button_gbox); layout->addWidget(button_gbox, 1);
layout->addItem(new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum));
QHBoxLayout* main_layout = new QHBoxLayout(parent); QHBoxLayout* main_layout = new QHBoxLayout(parent);
main_layout->addWidget(scrollarea); main_layout->addWidget(scrollarea);

4
src/duckstation-qt/inputbindingwidgets.cpp
View File

@ -29,8 +29,8 @@ InputBindingWidget::InputBindingWidget(QWidget* parent, SettingsInterface* sif,
std::string section_name, std::string key_name) std::string section_name, std::string key_name)
: QPushButton(parent) : QPushButton(parent)
{ {
setMinimumWidth(225); setMinimumWidth(220);
setMaximumWidth(225); setMaximumWidth(220);
connect(this, &QPushButton::clicked, this, &InputBindingWidget::onClicked); connect(this, &QPushButton::clicked, this, &InputBindingWidget::onClicked);