notsoyuzu
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure_input_player: Set minimum width on controls

This commit is contained in:
Zach Hilman 2018-11-17 16:26:03 -05:00
parent dd92db3fb0
commit 312ef596a5
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/yuzu/configuration/configure_input_player.ui
View File

@ -235,6 +235,12 @@
<layout class="QHBoxLayout" name="buttonDpadLeftHorizontalLayout"> <layout class="QHBoxLayout" name="buttonDpadLeftHorizontalLayout">
<item> <item>
<widget class="QLabel" name="labelDpadLeft"> <widget class="QLabel" name="labelDpadLeft">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Left:</string> <string>Left:</string>
</property> </property>
@ -257,6 +263,12 @@
<layout class="QHBoxLayout" name="buttonDpadRightHorizontalLayout"> <layout class="QHBoxLayout" name="buttonDpadRightHorizontalLayout">
<item> <item>
<widget class="QLabel" name="labelDpadRight"> <widget class="QLabel" name="labelDpadRight">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Right:</string> <string>Right:</string>
</property> </property>
@ -294,6 +306,12 @@
<layout class="QHBoxLayout" name="buttonFaceButtonsAHorizontalLayout"> <layout class="QHBoxLayout" name="buttonFaceButtonsAHorizontalLayout">
<item> <item>
<widget class="QLabel" name="labelA"> <widget class="QLabel" name="labelA">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>A:</string> <string>A:</string>
</property> </property>
@ -316,6 +334,12 @@
<layout class="QHBoxLayout" name="buttonFaceButtonsBHorizontalLayout"> <layout class="QHBoxLayout" name="buttonFaceButtonsBHorizontalLayout">
<item> <item>
<widget class="QLabel" name="labelB"> <widget class="QLabel" name="labelB">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>B:</string> <string>B:</string>
</property> </property>
@ -1017,22 +1041,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QLabel" name="override_label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Check the box to override the global default key with this one for this game only.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"/> <layout class="QHBoxLayout" name="horizontalLayout"/>
</item> </item>

13
src/yuzu_cmd/config.cpp
View File

@ -324,13 +324,12 @@ void Config::ReadValues() {
Settings::values.current_user = std::clamp<int>( Settings::values.current_user = std::clamp<int>(
sdl2_config->GetInteger("System", "current_user", 0), 0, Service::Account::MAX_USERS - 1); sdl2_config->GetInteger("System", "current_user", 0), 0, Service::Account::MAX_USERS - 1);
const auto enabled = sdl2_config->GetBoolean("System", "rng_seed_enabled", false); const auto enabled = sdl2_config->GetBoolean("System", "rng_seed_enabled", false);
if (enabled) { if (enabled) {
Settings::values.rng_seed = sdl2_config->GetInteger("System", "rng_seed", 0); Settings::values.rng_seed = sdl2_config->GetInteger("System", "rng_seed", 0);
} } else {
else { Settings::values.rng_seed = std::nullopt;
Settings::values.rng_seed = std::nullopt; }
}
// Core // Core
Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true); Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true);