From ac4e5d394e1ddf6bc663ea5e224932eed0fedcbd Mon Sep 17 00:00:00 2001
From: Daniil Vinogradov <xitrix@bk.ru>
Date: Sat, 15 Feb 2025 17:18:51 +0100
Subject: [PATCH] Hide non wrapped controllers
---
src/MeloNX/MeloNX/App/Views/ContentView.swift | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/MeloNX/MeloNX/App/Views/ContentView.swift b/src/MeloNX/MeloNX/App/Views/ContentView.swift
index 640db7af5..1f39d2c0f 100644
--- a/src/MeloNX/MeloNX/App/Views/ContentView.swift
+++ b/src/MeloNX/MeloNX/App/Views/ContentView.swift
@@ -309,8 +309,9 @@ struct ContentView: View {
self.onscreencontroller = onscreen
}
- controllersList.removeAll(where: { $0.id == "0"})
-
+ controllersList.removeAll(where: { $0.id == "0" || (!$0.name.starts(with: "GC - ") && $0 != onscreencontroller) })
+ controllersList.mutableForEach { $0.name = $0.name.replacingOccurrences(of: "GC - ", with: "") }
+
currentControllers = []
if controllersList.count == 1 {
@@ -318,7 +319,7 @@ struct ContentView: View {
currentControllers.append(controller)
} else if (controllersList.count - 1) >= 1 {
for controller in controllersList {
- if controller.id != onscreencontroller.id && controller.name.starts(with: "GC - ") && !currentControllers.contains(where: { $0.id == controller.id }) {
+ if controller.id != onscreencontroller.id && !currentControllers.contains(where: { $0.id == controller.id }) {
currentControllers.append(controller)
}
}
@@ -400,3 +401,10 @@ func loadSettings() -> Ryujinx.Configuration? {
}
}
+extension Array {
+ @inlinable public mutating func mutableForEach(_ body: (inout Element) throws -> Void) rethrows {
+ for index in self.indices {
+ try body(&self[index])
+ }
+ }
+}