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

Address Ac_k's comments

Browse source
This commit is contained in:
Thog 2019-12-07 17:33:23 +01:00
parent 8885c68693
commit c2ae90310e
No known key found for this signature in database
GPG key ID: 0CD291558FAFDBC6
4 changed files with 28 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Ryujinx.Common/Configuration/ConfigurationState.cs
View file

@ -48,7 +48,6 @@ namespace Ryujinx.Configuration
/// <summary>
/// Used to toggle columns in the GUI
/// </summary>
// TODO: UPDATE THIS TO MASTER
public Columns GuiColumns { get; private set; }
/// <summary>

18
Ryujinx.HLE/Input/Hid.cs
View file

@ -53,18 +53,12 @@ namespace Ryujinx.HLE.Input
{
switch (controllerType)
{
case ControllerType.Handheld:
return ControllerStatus.Handheld;
case ControllerType.NpadLeft:
return ControllerStatus.NpadLeft;
case ControllerType.NpadRight:
return ControllerStatus.NpadRight;
case ControllerType.NpadPair:
return ControllerStatus.NpadPair;
case ControllerType.ProController:
return ControllerStatus.ProController;
default:
throw new NotImplementedException();
case ControllerType.Handheld: return ControllerStatus.Handheld;
case ControllerType.NpadLeft: return ControllerStatus.NpadLeft;
case ControllerType.NpadRight: return ControllerStatus.NpadRight;
case ControllerType.NpadPair: return ControllerStatus.NpadPair;
case ControllerType.ProController: return ControllerStatus.ProController;
default: throw new NotImplementedException();
}
}

44
Ryujinx/Ui/MainWindow.cs
View file

@ -95,16 +95,16 @@ namespace Ryujinx.Ui
_mainWin.Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.assets.Icon.png");
_stopEmulation.Sensitive = false;
if (ConfigurationState.Instance.Ui.GuiColumns.FavColumn) { _favToggle.Active = true; }
if (ConfigurationState.Instance.Ui.GuiColumns.IconColumn) { _iconToggle.Active = true; }
if (ConfigurationState.Instance.Ui.GuiColumns.AppColumn) { _appToggle.Active = true; }
if (ConfigurationState.Instance.Ui.GuiColumns.DevColumn) { _developerToggle.Active = true; }
if (ConfigurationState.Instance.Ui.GuiColumns.VersionColumn) { _versionToggle.Active = true; }
if (ConfigurationState.Instance.Ui.GuiColumns.TimePlayedColumn) { _timePlayedToggle.Active = true; }
if (ConfigurationState.Instance.Ui.GuiColumns.LastPlayedColumn) { _lastPlayedToggle.Active = true; }
if (ConfigurationState.Instance.Ui.GuiColumns.FileExtColumn) { _fileExtToggle.Active = true; }
if (ConfigurationState.Instance.Ui.GuiColumns.FileSizeColumn) { _fileSizeToggle.Active = true; }
if (ConfigurationState.Instance.Ui.GuiColumns.PathColumn) { _pathToggle.Active = true; }
if (ConfigurationState.Instance.Ui.GuiColumns.FavColumn) _favToggle.Active = true;
if (ConfigurationState.Instance.Ui.GuiColumns.IconColumn) _iconToggle.Active = true;
if (ConfigurationState.Instance.Ui.GuiColumns.AppColumn) _appToggle.Active = true;
if (ConfigurationState.Instance.Ui.GuiColumns.DevColumn) _developerToggle.Active = true;
if (ConfigurationState.Instance.Ui.GuiColumns.VersionColumn) _versionToggle.Active = true;
if (ConfigurationState.Instance.Ui.GuiColumns.TimePlayedColumn) _timePlayedToggle.Active = true;
if (ConfigurationState.Instance.Ui.GuiColumns.LastPlayedColumn) _lastPlayedToggle.Active = true;
if (ConfigurationState.Instance.Ui.GuiColumns.FileExtColumn) _fileExtToggle.Active = true;
if (ConfigurationState.Instance.Ui.GuiColumns.FileSizeColumn) _fileSizeToggle.Active = true;
if (ConfigurationState.Instance.Ui.GuiColumns.PathColumn) _pathToggle.Active = true;
_gameTable.Model = _tableStore = new ListStore(
typeof(bool),
@ -184,15 +184,15 @@ namespace Ryujinx.Ui
else if (column.Title == "Path") { _pathColumn = column; }
}
if (ConfigurationState.Instance.Ui.GuiColumns.FavColumn) { _favColumn.SortColumnId = 0; }
if (ConfigurationState.Instance.Ui.GuiColumns.AppColumn) { _appColumn.SortColumnId = 2; }
if (ConfigurationState.Instance.Ui.GuiColumns.DevColumn) { _devColumn.SortColumnId = 3; }
if (ConfigurationState.Instance.Ui.GuiColumns.VersionColumn) { _versionColumn.SortColumnId = 4; }
if (ConfigurationState.Instance.Ui.GuiColumns.TimePlayedColumn) { _timePlayedColumn.SortColumnId = 5; }
if (ConfigurationState.Instance.Ui.GuiColumns.LastPlayedColumn) { _lastPlayedColumn.SortColumnId = 6; }
if (ConfigurationState.Instance.Ui.GuiColumns.FileExtColumn) { _fileExtColumn.SortColumnId = 7; }
if (ConfigurationState.Instance.Ui.GuiColumns.FileSizeColumn) { _fileSizeColumn.SortColumnId = 8; }
if (ConfigurationState.Instance.Ui.GuiColumns.PathColumn) { _pathColumn.SortColumnId = 9; }
if (ConfigurationState.Instance.Ui.GuiColumns.FavColumn) _favColumn.SortColumnId = 0;
if (ConfigurationState.Instance.Ui.GuiColumns.AppColumn) _appColumn.SortColumnId = 2;
if (ConfigurationState.Instance.Ui.GuiColumns.DevColumn) _devColumn.SortColumnId = 3;
if (ConfigurationState.Instance.Ui.GuiColumns.VersionColumn) _versionColumn.SortColumnId = 4;
if (ConfigurationState.Instance.Ui.GuiColumns.TimePlayedColumn) _timePlayedColumn.SortColumnId = 5;
if (ConfigurationState.Instance.Ui.GuiColumns.LastPlayedColumn) _lastPlayedColumn.SortColumnId = 6;
if (ConfigurationState.Instance.Ui.GuiColumns.FileExtColumn) _fileExtColumn.SortColumnId = 7;
if (ConfigurationState.Instance.Ui.GuiColumns.FileSizeColumn) _fileSizeColumn.SortColumnId = 8;
if (ConfigurationState.Instance.Ui.GuiColumns.PathColumn) _pathColumn.SortColumnId = 9;
}
private HLE.Switch InitializeSwitchInstance()
@ -563,7 +563,7 @@ namespace Ryujinx.Ui
settingsWin.Show();
}
private void Update_Pressed(object o, EventArgs args)
private void Update_Pressed(object sender, EventArgs args)
{
string ryuUpdater = System.IO.Path.Combine(new VirtualFileSystem().GetBasePath(), "RyuUpdater.exe");
@ -647,7 +647,7 @@ namespace Ryujinx.Ui
UpdateColumns();
}
private void FileSize_Toggled(object o, EventArgs args)
private void FileSize_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.GuiColumns.FileSizeColumn.Value = _fileSizeToggle.Active;
@ -655,7 +655,7 @@ namespace Ryujinx.Ui
UpdateColumns();
}
private void Path_Toggled(object o, EventArgs args)
private void Path_Toggled(object sender, EventArgs args)
{
ConfigurationState.Instance.Ui.GuiColumns.PathColumn.Value = _pathToggle.Active;

5
Ryujinx/Ui/NpadController.cs
View file

@ -24,11 +24,6 @@ namespace Ryujinx.Ui.Input
return _inner.Enabled && Joystick.GetState(_inner.Index).IsConnected;
}
public void Initialize()
{
}
public ControllerButtons GetButtons()
{
if (!IsEnabled())