mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge f2c5af2de7 into 1c1959eaeb

Browse source
This commit is contained in:
Joshua Goins 2023-10-10 11:02:03 +03:00 • committed by GitHub
commit 0544b587c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/yuzu/configuration/configure_input.cpp
View file

@ -3,6 +3,7 @@
#include <memory> #include <memory>
#include <thread> #include <thread>
#include <QScrollArea>
#include "common/settings.h" #include "common/settings.h"
#include "common/settings_enums.h" #include "common/settings_enums.h"
@ -114,7 +115,13 @@ void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem,
for (std::size_t i = 0; i < player_tabs.size(); ++i) { for (std::size_t i = 0; i < player_tabs.size(); ++i) {
player_tabs[i]->setLayout(new QHBoxLayout(player_tabs[i])); player_tabs[i]->setLayout(new QHBoxLayout(player_tabs[i]));
player_tabs[i]->layout()->addWidget(player_controllers[i]);
auto scroll_area = new QScrollArea(player_tabs[i]);
player_tabs[i]->layout()->addWidget(scroll_area);
scroll_area->setWidget(player_controllers[i]);
scroll_area->setWidgetResizable(true);
scroll_area->setFrameShape(QFrame::Shape::NoFrame);
connect(player_controllers[i], &ConfigureInputPlayer::Connected, [&, i](bool is_connected) { connect(player_controllers[i], &ConfigureInputPlayer::Connected, [&, i](bool is_connected) {
// Ensures that the controllers are always connected in sequential order // Ensures that the controllers are always connected in sequential order
if (is_connected) { if (is_connected) {

88
src/yuzu/configuration/configure_input_player.ui
View file

@ -10,6 +10,18 @@
<height>487</height> <height>487</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>743</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Configure Input</string> <string>Configure Input</string>
</property> </property>
@ -1327,22 +1339,28 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QSlider" name="sliderZLThreshold"> <widget class="QSlider" name="sliderZLThreshold">
<property name="maximumSize"> <property name="minimumSize">
<size> <size>
<width>70</width> <width>0</width>
<height>15</height> <height>20</height>
</size> </size>
</property> </property>
<property name="maximum"> <property name="maximumSize">
<number>100</number> <size>
</property> <width>70</width>
<property name="orientation"> <height>20</height>
<enum>Qt::Horizontal</enum> </size>
</property> </property>
</widget> <property name="maximum">
</item> <number>100</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -1774,22 +1792,28 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QSlider" name="sliderZRThreshold"> <widget class="QSlider" name="sliderZRThreshold">
<property name="maximumSize"> <property name="minimumSize">
<size> <size>
<width>70</width> <width>0</width>
<height>15</height> <height>20</height>
</size> </size>
</property> </property>
<property name="maximum"> <property name="maximumSize">
<number>100</number> <size>
</property> <width>70</width>
<property name="orientation"> <height>20</height>
<enum>Qt::Horizontal</enum> </size>
</property> </property>
</widget> <property name="maximum">
</item> <number>100</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>