mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-12 22:14:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt/input: add squircle to pad settings dialog

Browse Source
This commit is contained in:
Megamouse 2020-07-12 19:32:38 +02:00
parent 4d9533ea54
commit e1af6dc4af
2 changed files with 89 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View File

@ -881,6 +881,15 @@ void pad_settings_dialog::UpdateLabels(bool is_reset)
ui->stick_multi_right->setRange(std::stod(stick_multi_range_right.front()) / 100.0, std::stod(stick_multi_range_right.back()) / 100.0);
ui->stick_multi_right->setValue(m_handler_cfg.rstickmultiplier / 100.0);
// Update Squircle Factors
std::vector<std::string> squircle_range_left = m_handler_cfg.lpadsquircling.to_list();
ui->squircle_left->setRange(std::stoi(squircle_range_left.front()), std::stoi(squircle_range_left.back()));
ui->squircle_left->setValue(m_handler_cfg.lpadsquircling);
std::vector<std::string> squircle_range_right = m_handler_cfg.rpadsquircling.to_list();
ui->squircle_right->setRange(std::stoi(squircle_range_right.front()), std::stoi(squircle_range_right.back()));
ui->squircle_right->setValue(m_handler_cfg.rpadsquircling);
RepaintPreviewLabel(ui->preview_stick_left, ui->slider_stick_left->value(), ui->slider_stick_left->size().width(), lx, ly, m_handler_cfg.lstickmultiplier / 100.0);
RepaintPreviewLabel(ui->preview_stick_right, ui->slider_stick_right->value(), ui->slider_stick_right->size().width(), rx, ry, m_handler_cfg.rstickmultiplier / 100.0);
@ -1391,6 +1400,8 @@ void pad_settings_dialog::SaveProfile()
m_handler_cfg.lstickmultiplier.set(ui->stick_multi_left->value() * 100);
m_handler_cfg.rstickmultiplier.set(ui->stick_multi_right->value() * 100);
m_handler_cfg.lpadsquircling.set(ui->squircle_left->value());
m_handler_cfg.rpadsquircling.set(ui->squircle_right->value());
if (m_handler->has_rumble())
{

78
rpcs3/rpcs3qt/pad_settings_dialog.ui
View File

@ -2156,6 +2156,84 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gb_squircle">
<property name="title">
<string>Squircle Values</string>
</property>
<layout class="QHBoxLayout" name="layout_squircle">
<property name="leftMargin">
<number>5</number>
</property>
<property name="topMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>5</number>
</property>
<property name="bottomMargin">
<number>5</number>
</property>
<item>
<widget class="QLabel" name="label_squircle_left">
<property name="text">
<string>Left</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="squircle_left">
<property name="maximum">
<number>1000000</number>
</property>
<property name="singleStep">
<number>1000</number>
</property>
</widget>
</item>
<item>
<spacer name="spacer_squircle_left">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_squircle_right">
<property name="text">
<string>Right</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="squircle_right">
<property name="maximum">
<number>1000000</number>
</property>
</widget>
</item>
<item>
<spacer name="spacer_squircle_right">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gb_sticks">
<property name="title">