diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2018-11-17 22:26:03 +0100 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-11-19 05:22:36 +0100 |
| commit | 312ef596a5fa93f93444b1485d43398f0bcde043 (patch) | |
| tree | 8ff6da757a106d0381679bc5402fef03062f64b6 | |
| parent | configure_input: Properly update UI components on removal of player (diff) | |
| download | yuzu-312ef596a5fa93f93444b1485d43398f0bcde043.tar yuzu-312ef596a5fa93f93444b1485d43398f0bcde043.tar.gz yuzu-312ef596a5fa93f93444b1485d43398f0bcde043.tar.bz2 yuzu-312ef596a5fa93f93444b1485d43398f0bcde043.tar.lz yuzu-312ef596a5fa93f93444b1485d43398f0bcde043.tar.xz yuzu-312ef596a5fa93f93444b1485d43398f0bcde043.tar.zst yuzu-312ef596a5fa93f93444b1485d43398f0bcde043.zip | |
| -rw-r--r-- | src/yuzu/configuration/configure_input_player.ui | 40 | ||||
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 13 |
2 files changed, 30 insertions, 23 deletions
diff --git a/src/yuzu/configuration/configure_input_player.ui b/src/yuzu/configuration/configure_input_player.ui index 191206663..42db020be 100644 --- a/src/yuzu/configuration/configure_input_player.ui +++ b/src/yuzu/configuration/configure_input_player.ui @@ -235,6 +235,12 @@ <layout class="QHBoxLayout" name="buttonDpadLeftHorizontalLayout"> <item> <widget class="QLabel" name="labelDpadLeft"> + <property name="minimumSize"> + <size> + <width>80</width> + <height>0</height> + </size> + </property> <property name="text"> <string>Left:</string> </property> @@ -257,6 +263,12 @@ <layout class="QHBoxLayout" name="buttonDpadRightHorizontalLayout"> <item> <widget class="QLabel" name="labelDpadRight"> + <property name="minimumSize"> + <size> + <width>80</width> + <height>0</height> + </size> + </property> <property name="text"> <string>Right:</string> </property> @@ -294,6 +306,12 @@ <layout class="QHBoxLayout" name="buttonFaceButtonsAHorizontalLayout"> <item> <widget class="QLabel" name="labelA"> + <property name="minimumSize"> + <size> + <width>80</width> + <height>0</height> + </size> + </property> <property name="text"> <string>A:</string> </property> @@ -316,6 +334,12 @@ <layout class="QHBoxLayout" name="buttonFaceButtonsBHorizontalLayout"> <item> <widget class="QLabel" name="labelB"> + <property name="minimumSize"> + <size> + <width>80</width> + <height>0</height> + </size> + </property> <property name="text"> <string>B:</string> </property> @@ -1018,22 +1042,6 @@ </spacer> </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> <layout class="QHBoxLayout" name="horizontalLayout"/> </item> <item> diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 0d5df8fd0..c66353a65 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -324,13 +324,12 @@ void Config::ReadValues() { Settings::values.current_user = std::clamp<int>( sdl2_config->GetInteger("System", "current_user", 0), 0, Service::Account::MAX_USERS - 1); - const auto enabled = sdl2_config->GetBoolean("System", "rng_seed_enabled", false); - if (enabled) { - Settings::values.rng_seed = sdl2_config->GetInteger("System", "rng_seed", 0); - } - else { - Settings::values.rng_seed = std::nullopt; - } + const auto enabled = sdl2_config->GetBoolean("System", "rng_seed_enabled", false); + if (enabled) { + Settings::values.rng_seed = sdl2_config->GetInteger("System", "rng_seed", 0); + } else { + Settings::values.rng_seed = std::nullopt; + } // Core Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true); |