Merge branch 'Alia5:develop' into develop

pull/165/head
LemmusLemmus 2 years ago committed by GitHub
commit c881b74fe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -45,7 +45,7 @@ Item {
maxControllers: 4,
disableOverlay: false,
realDeviceIds: false,
allowDesktopConfig: true,
allowDesktopConfig: false,
emulateDS4: false,
})
@ -66,7 +66,7 @@ Item {
maxControllers: 4,
disableOverlay: false,
realDeviceIds: false,
allowDesktopConfig: true,
allowDesktopConfig: false,
emulateDS4: false,
})
}
@ -83,7 +83,7 @@ Item {
maxControllersSpinBox.value = shortcutInfo.maxControllers
disableOverlayCheckbox.checked = shortcutInfo.disableOverlay || false
realDeviceIds.checked = shortcutInfo.realDeviceIds || false
allowDesktopConfig.checked = shortcutInfo.allowDesktopConfig || true
allowDesktopConfig.checked = shortcutInfo.allowDesktopConfig || false
emulateDS4.checked = shortcutInfo.emulateDS4 || false
}

@ -48,7 +48,7 @@ inline struct Window {
inline struct Controller {
int maxControllers = 4;
bool allowDesktopConfig = Settings::launch.launch;
bool allowDesktopConfig = false;
bool emulateDS4 = false;
} controller;

Loading…
Cancel
Save