diff --git a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate
index bbcefad60..f791e4f47 100644
Binary files a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate and b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/src/MeloNX/MeloNX.xcodeproj/xcuserdata/stossy11.xcuserdatad/xcschemes/xcschememanagement.plist b/src/MeloNX/MeloNX.xcodeproj/xcuserdata/stossy11.xcuserdatad/xcschemes/xcschememanagement.plist
index 8ff6cf524..19b8e18b3 100644
--- a/src/MeloNX/MeloNX.xcodeproj/xcuserdata/stossy11.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/src/MeloNX/MeloNX.xcodeproj/xcuserdata/stossy11.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,12 +12,12 @@
Ryujinx.xcscheme_^#shared#^_
orderHint
- 2
+ 4
com.Stossy11.MeloNX.RyujinxAg.xcscheme_^#shared#^_
orderHint
- 1
+ 3
SuppressBuildableAutocreation
diff --git a/src/MeloNX/MeloNX/App/Views/GamesList/GameListView.swift b/src/MeloNX/MeloNX/App/Views/GamesList/GameListView.swift
index 191286685..a20129440 100644
--- a/src/MeloNX/MeloNX/App/Views/GamesList/GameListView.swift
+++ b/src/MeloNX/MeloNX/App/Views/GamesList/GameListView.swift
@@ -11,6 +11,7 @@ import UniformTypeIdentifiers
struct GameLibraryView: View {
@Binding var startemu: Game?
+ // @State var importDLCs = false
@State private var games: [Game] = []
@State private var searchText = ""
@State private var isSearching = false
@@ -154,31 +155,35 @@ struct GameLibraryView: View {
}
} else {
- Button {
- Ryujinx.shared.removeFirmware()
- let firmware = Ryujinx.shared.fetchFirmwareVersion()
- firmwareversion = (firmware == "" ? "0" : firmware)
- } label: {
- Text("Remove Firmware")
- }
-
-
- Button {
- let game = Game(containerFolder: URL(string: "none")!, fileType: .item, fileURL: URL(string: "MiiMaker")!, titleName: "Mii Maker", titleId: "0", developer: "Nintendo", version: firmwareversion)
-
- self.startemu = game
- } label: {
- Text("Mii Maker")
- }
- Button {
- DispatchQueue.main.async {
- isImporting.toggle()
+ Menu("Firmware") {
+ Button {
+ Ryujinx.shared.removeFirmware()
+ let firmware = Ryujinx.shared.fetchFirmwareVersion()
+ firmwareversion = (firmware == "" ? "0" : firmware)
+ } label: {
+ Text("Remove Firmware")
+ }
+
+
+ Button {
+ let game = Game(containerFolder: URL(string: "none")!, fileType: .item, fileURL: URL(string: "MiiMaker")!, titleName: "Mii Maker", titleId: "0", developer: "Nintendo", version: firmwareversion)
+
+ self.startemu = game
+ } label: {
+ Text("Mii Maker")
+ }
+ Button {
+ DispatchQueue.main.async {
+ isImporting.toggle()
+ }
+ } label: {
+ Text("Open game from system")
}
- } label: {
- Text("Open game from system")
}
}
+
+
Button {
let documentsUrl = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
let sharedurl = documentsUrl.absoluteString.replacingOccurrences(of: "file://", with: "shareddocuments://")
diff --git a/src/MeloNX/MeloNX/App/Views/SettingsView/SettingsView.swift b/src/MeloNX/MeloNX/App/Views/SettingsView/SettingsView.swift
index 3294b42f1..153263bec 100644
--- a/src/MeloNX/MeloNX/App/Views/SettingsView/SettingsView.swift
+++ b/src/MeloNX/MeloNX/App/Views/SettingsView/SettingsView.swift
@@ -226,6 +226,7 @@ struct SettingsView: View {
.font(.body)
}
.tint(.blue)
+ .onDrag({ NSItemProvider() })
} label: {
if let controller = currentControllers.firstIndex(where: { $0.id == controller.id } ) {
diff --git a/src/Ryujinx.Headless.SDL2/Program.cs b/src/Ryujinx.Headless.SDL2/Program.cs
index 69fedb229..2f9fce03e 100644
--- a/src/Ryujinx.Headless.SDL2/Program.cs
+++ b/src/Ryujinx.Headless.SDL2/Program.cs
@@ -322,7 +322,7 @@ namespace Ryujinx.Headless.SDL2
var gameInfo = GetGameInfo(stream, extension);
- return new GameInfoNative(0, gameInfo.TitleName, 0, gameInfo.Developer, 0, gameInfo.Icon);
+ return new GameInfoNative(gameInfo.FileSize, gameInfo.TitleName, gameInfo.TitleId, gameInfo.Developer, gameInfo.Version, gameInfo.Icon);
}
public static GameInfo? GetGameInfo(Stream gameStream, string extension)