diff options
| author | 2018-11-17 16:26:03 -0500 | |
|---|---|---|
| committer | 2018-11-18 23:22:36 -0500 | |
| commit | 312ef596a5fa93f93444b1485d43398f0bcde043 (patch) | |
| tree | 8ff6da757a106d0381679bc5402fef03062f64b6 /src | |
| parent | configure_input: Properly update UI components on removal of player (diff) | |
| download | yuzu-312ef596a5fa93f93444b1485d43398f0bcde043.tar.gz yuzu-312ef596a5fa93f93444b1485d43398f0bcde043.tar.xz yuzu-312ef596a5fa93f93444b1485d43398f0bcde043.zip | |
configure_input_player: Set minimum width on controls
Diffstat (limited to 'src')
| -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 @@ | |||
| 235 | <layout class="QHBoxLayout" name="buttonDpadLeftHorizontalLayout"> | 235 | <layout class="QHBoxLayout" name="buttonDpadLeftHorizontalLayout"> |
| 236 | <item> | 236 | <item> |
| 237 | <widget class="QLabel" name="labelDpadLeft"> | 237 | <widget class="QLabel" name="labelDpadLeft"> |
| 238 | <property name="minimumSize"> | ||
| 239 | <size> | ||
| 240 | <width>80</width> | ||
| 241 | <height>0</height> | ||
| 242 | </size> | ||
| 243 | </property> | ||
| 238 | <property name="text"> | 244 | <property name="text"> |
| 239 | <string>Left:</string> | 245 | <string>Left:</string> |
| 240 | </property> | 246 | </property> |
| @@ -257,6 +263,12 @@ | |||
| 257 | <layout class="QHBoxLayout" name="buttonDpadRightHorizontalLayout"> | 263 | <layout class="QHBoxLayout" name="buttonDpadRightHorizontalLayout"> |
| 258 | <item> | 264 | <item> |
| 259 | <widget class="QLabel" name="labelDpadRight"> | 265 | <widget class="QLabel" name="labelDpadRight"> |
| 266 | <property name="minimumSize"> | ||
| 267 | <size> | ||
| 268 | <width>80</width> | ||
| 269 | <height>0</height> | ||
| 270 | </size> | ||
| 271 | </property> | ||
| 260 | <property name="text"> | 272 | <property name="text"> |
| 261 | <string>Right:</string> | 273 | <string>Right:</string> |
| 262 | </property> | 274 | </property> |
| @@ -294,6 +306,12 @@ | |||
| 294 | <layout class="QHBoxLayout" name="buttonFaceButtonsAHorizontalLayout"> | 306 | <layout class="QHBoxLayout" name="buttonFaceButtonsAHorizontalLayout"> |
| 295 | <item> | 307 | <item> |
| 296 | <widget class="QLabel" name="labelA"> | 308 | <widget class="QLabel" name="labelA"> |
| 309 | <property name="minimumSize"> | ||
| 310 | <size> | ||
| 311 | <width>80</width> | ||
| 312 | <height>0</height> | ||
| 313 | </size> | ||
| 314 | </property> | ||
| 297 | <property name="text"> | 315 | <property name="text"> |
| 298 | <string>A:</string> | 316 | <string>A:</string> |
| 299 | </property> | 317 | </property> |
| @@ -316,6 +334,12 @@ | |||
| 316 | <layout class="QHBoxLayout" name="buttonFaceButtonsBHorizontalLayout"> | 334 | <layout class="QHBoxLayout" name="buttonFaceButtonsBHorizontalLayout"> |
| 317 | <item> | 335 | <item> |
| 318 | <widget class="QLabel" name="labelB"> | 336 | <widget class="QLabel" name="labelB"> |
| 337 | <property name="minimumSize"> | ||
| 338 | <size> | ||
| 339 | <width>80</width> | ||
| 340 | <height>0</height> | ||
| 341 | </size> | ||
| 342 | </property> | ||
| 319 | <property name="text"> | 343 | <property name="text"> |
| 320 | <string>B:</string> | 344 | <string>B:</string> |
| 321 | </property> | 345 | </property> |
| @@ -1018,22 +1042,6 @@ | |||
| 1018 | </spacer> | 1042 | </spacer> |
| 1019 | </item> | 1043 | </item> |
| 1020 | <item> | 1044 | <item> |
| 1021 | <widget class="QLabel" name="override_label"> | ||
| 1022 | <property name="sizePolicy"> | ||
| 1023 | <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | ||
| 1024 | <horstretch>0</horstretch> | ||
| 1025 | <verstretch>0</verstretch> | ||
| 1026 | </sizepolicy> | ||
| 1027 | </property> | ||
| 1028 | <property name="text"> | ||
| 1029 | <string>Check the box to override the global default key with this one for this game only.</string> | ||
| 1030 | </property> | ||
| 1031 | <property name="wordWrap"> | ||
| 1032 | <bool>true</bool> | ||
| 1033 | </property> | ||
| 1034 | </widget> | ||
| 1035 | </item> | ||
| 1036 | <item> | ||
| 1037 | <layout class="QHBoxLayout" name="horizontalLayout"/> | 1045 | <layout class="QHBoxLayout" name="horizontalLayout"/> |
| 1038 | </item> | 1046 | </item> |
| 1039 | <item> | 1047 | <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() { | |||
| 324 | Settings::values.current_user = std::clamp<int>( | 324 | Settings::values.current_user = std::clamp<int>( |
| 325 | sdl2_config->GetInteger("System", "current_user", 0), 0, Service::Account::MAX_USERS - 1); | 325 | sdl2_config->GetInteger("System", "current_user", 0), 0, Service::Account::MAX_USERS - 1); |
| 326 | 326 | ||
| 327 | const auto enabled = sdl2_config->GetBoolean("System", "rng_seed_enabled", false); | 327 | const auto enabled = sdl2_config->GetBoolean("System", "rng_seed_enabled", false); |
| 328 | if (enabled) { | 328 | if (enabled) { |
| 329 | Settings::values.rng_seed = sdl2_config->GetInteger("System", "rng_seed", 0); | 329 | Settings::values.rng_seed = sdl2_config->GetInteger("System", "rng_seed", 0); |
| 330 | } | 330 | } else { |
| 331 | else { | 331 | Settings::values.rng_seed = std::nullopt; |
| 332 | Settings::values.rng_seed = std::nullopt; | 332 | } |
| 333 | } | ||
| 334 | 333 | ||
| 335 | // Core | 334 | // Core |
| 336 | Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true); | 335 | Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true); |