From 2794af6d06ed6bb844d95e26a45546614f885332 Mon Sep 17 00:00:00 2001
From: lynxnb <niccolo.betto@gmail.com>
Date: Fri, 17 Mar 2023 19:25:42 +0100
Subject: [PATCH] OSC: delegate config reset to individual buttons

---
 .../main/java/emu/skyline/input/onscreen/OnScreenButton.kt   | 5 +++++
 .../emu/skyline/input/onscreen/OnScreenControllerView.kt     | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/emu/skyline/input/onscreen/OnScreenButton.kt b/app/src/main/java/emu/skyline/input/onscreen/OnScreenButton.kt
index 7e913bad..0f0eec33 100644
--- a/app/src/main/java/emu/skyline/input/onscreen/OnScreenButton.kt
+++ b/app/src/main/java/emu/skyline/input/onscreen/OnScreenButton.kt
@@ -184,4 +184,9 @@ abstract class OnScreenButton(
         relativeX = defaultRelativeX
         relativeY = defaultRelativeY
     }
+
+    open fun resetConfig() {
+        resetRelativeValues()
+        config.enabled = true
+    }
 }
diff --git a/app/src/main/java/emu/skyline/input/onscreen/OnScreenControllerView.kt b/app/src/main/java/emu/skyline/input/onscreen/OnScreenControllerView.kt
index dc657c74..62b2e47c 100644
--- a/app/src/main/java/emu/skyline/input/onscreen/OnScreenControllerView.kt
+++ b/app/src/main/java/emu/skyline/input/onscreen/OnScreenControllerView.kt
@@ -269,8 +269,7 @@ class OnScreenControllerView @JvmOverloads constructor(context : Context, attrs
 
     fun resetControls() {
         controls.allButtons.forEach {
-            it.resetRelativeValues()
-            it.config.enabled = true
+            it.resetConfig()
         }
         controls.globalScale = 1.15f
         controls.alpha = 155