From 8b90606564ef416bb18c5c47a45a67c0bbbff484 Mon Sep 17 00:00:00 2001 From: adas20 Date: Mon, 28 Jul 2025 14:48:57 -0400 Subject: [PATCH] WIP on Button Impl, made combo button setting run time editable --- .../citra/citra_emu/features/settings/ui/SettingsAdapter.kt | 2 +- .../features/settings/ui/SettingsFragmentPresenter.kt | 2 +- .../main/java/org/citra/citra_emu/overlay/InputOverlay.kt | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt index 3cfd67178..a69667c5d 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt @@ -771,7 +771,7 @@ class SettingsAdapter( fragmentView?.onSettingChanged() fragmentView?.putSetting(setting as AbstractSetting) - fragmentView.loadSettingsList() + //fragmentView.loadSettingsList() //closeDialog() } } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt index 64f9eac97..4c38a0fcf 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt @@ -834,7 +834,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) } override val key = null override val section = null - override val isRuntimeEditable = false + override val isRuntimeEditable = true override val valueAsString get() = "" override val defaultValue = "" } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt index 42d79380a..840ce45bf 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt @@ -140,6 +140,11 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex else if (button.id == NativeLibrary.ButtonType.BUTTON_TURBO && button.status == NativeLibrary.ButtonState.PRESSED) { TurboHelper.toggleTurbo(true) } + /* + else if (button.id == NativeLibrary.ButtonType.BUTTON_COMBO && button.status == NativeLibrary.ButtonState.PRESSED) { + var comboButtonArray = + } + */ NativeLibrary.onGamePadEvent( NativeLibrary.TouchScreenDevice,