mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify logic from previous commit

Browse source
This commit is contained in:
Thog 2020-03-25 15:29:07 +01:00
commit 0c6698d049
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Ryujinx/Ui/MainWindow.cs
View file

@ -37,7 +37,6 @@ namespace Ryujinx.Ui
private static AutoResetEvent _deviceExitStatus = new AutoResetEvent(false); private static AutoResetEvent _deviceExitStatus = new AutoResetEvent(false);
private static ListStore _tableStore; private static ListStore _tableStore;
private static List<BlitStruct<ApplicationControlProperty>> _gameListControl;
private static bool _updatingGameTable; private static bool _updatingGameTable;
private static bool _gameLoaded; private static bool _gameLoaded;
@ -161,15 +160,13 @@ namespace Ryujinx.Ui
typeof(string), typeof(string),
typeof(string), typeof(string),
typeof(string), typeof(string),
typeof(int)); typeof(BlitStruct<ApplicationControlProperty>));
_tableStore.SetSortFunc(5, TimePlayedSort); _tableStore.SetSortFunc(5, TimePlayedSort);
_tableStore.SetSortFunc(6, LastPlayedSort); _tableStore.SetSortFunc(6, LastPlayedSort);
_tableStore.SetSortFunc(8, FileSizeSort); _tableStore.SetSortFunc(8, FileSizeSort);
_tableStore.SetSortColumnId(0, SortType.Descending); _tableStore.SetSortColumnId(0, SortType.Descending);
_gameListControl = new List<BlitStruct<ApplicationControlProperty>>();
UpdateColumns(); UpdateColumns();
UpdateGameTable(); UpdateGameTable();
@ -285,7 +282,6 @@ namespace Ryujinx.Ui
_updatingGameTable = true; _updatingGameTable = true;
_tableStore.Clear(); _tableStore.Clear();
_gameListControl.Clear();
Thread applicationLibraryThread = new Thread(() => Thread applicationLibraryThread = new Thread(() =>
{ {
@ -578,8 +574,6 @@ namespace Ryujinx.Ui
{ {
Application.Invoke(delegate Application.Invoke(delegate
{ {
_gameListControl.Add(args.AppData.ControlHolder);
TreeIter iter = _tableStore.AppendValues( TreeIter iter = _tableStore.AppendValues(
args.AppData.Favorite, args.AppData.Favorite,
new Gdk.Pixbuf(args.AppData.Icon, 75, 75), new Gdk.Pixbuf(args.AppData.Icon, 75, 75),
@ -591,8 +585,7 @@ namespace Ryujinx.Ui
args.AppData.FileExtension, args.AppData.FileExtension,
args.AppData.FileSize, args.AppData.FileSize,
args.AppData.Path, args.AppData.Path,
_gameListControl.Count - 1); args.AppData.ControlHolder);
}); });
} }
@ -665,9 +658,9 @@ namespace Ryujinx.Ui
if (treeIter.UserData == IntPtr.Zero) return; if (treeIter.UserData == IntPtr.Zero) return;
int controlDataIndex = (int)_tableStore.GetValue(treeIter, 10); BlitStruct<ApplicationControlProperty> controlData = (BlitStruct<ApplicationControlProperty>)_tableStore.GetValue(treeIter, 10);
GameTableContextMenu contextMenu = new GameTableContextMenu(_tableStore, _gameListControl[controlDataIndex], treeIter, _virtualFileSystem); GameTableContextMenu contextMenu = new GameTableContextMenu(_tableStore, controlData, treeIter, _virtualFileSystem);
contextMenu.ShowAll(); contextMenu.ShowAll();
contextMenu.PopupAtPointer(null); contextMenu.PopupAtPointer(null);
} }