diff --git a/Ryujinx/Ui/GLRenderer.cs b/Ryujinx/Ui/GLRenderer.cs index cc5ffb6a3f..eb5eb782f9 100644 --- a/Ryujinx/Ui/GLRenderer.cs +++ b/Ryujinx/Ui/GLRenderer.cs @@ -327,11 +327,9 @@ namespace Ryujinx.Ui StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs { - VSyncEnabled = _device.EnableDeviceVsync, - HostFpsStatus = $"Host FPS: {_device.Statistics.GetSystemFrameRate():0.0}", - GameFpsStatus = $"Game FPS: {_device.Statistics.GetGameFrameRate():0.0}", - HostFrameTimeStatus = $"Host Frame Time: {_device.Statistics.GetSystemFrameTime():00.00}ms", - GameFrameTimeStatus = $"Game Frame Time: {_device.Statistics.GetGameFrameTime():00.00}ms" + VSyncEnabled = _device.EnableDeviceVsync, + HostStatus = $"Host: {_device.Statistics.GetSystemFrameRate():00.00}FPS - {_device.Statistics.GetSystemFrameTime():00.00}ms", + GameStatus = $"Game: {_device.Statistics.GetGameFrameRate():00.00}FPS - { _device.Statistics.GetGameFrameTime():00.00}ms" }); _device.System.SignalVsync(); diff --git a/Ryujinx/Ui/MainWindow.cs b/Ryujinx/Ui/MainWindow.cs index 745c9bf4fc..94a7a88b02 100644 --- a/Ryujinx/Ui/MainWindow.cs +++ b/Ryujinx/Ui/MainWindow.cs @@ -56,8 +56,7 @@ namespace Ryujinx.Ui [GUI] CheckMenuItem _favToggle; [GUI] MenuItem _firmwareInstallFile; [GUI] MenuItem _firmwareInstallDirectory; - [GUI] Label _hostFpsStatus; - [GUI] Label _hostFrameTimeStatus; + [GUI] Label _hostStatus; [GUI] MenuItem _openDebugger; [GUI] CheckMenuItem _iconToggle; [GUI] CheckMenuItem _appToggle; @@ -68,8 +67,7 @@ namespace Ryujinx.Ui [GUI] CheckMenuItem _fileExtToggle; [GUI] CheckMenuItem _fileSizeToggle; [GUI] CheckMenuItem _pathToggle; - [GUI] Label _gameFpsStatus; - [GUI] Label _gameFrameTimeStatus; + [GUI] Label _gameStatus; [GUI] TreeView _gameTable; [GUI] ScrolledWindow _gameTableWindow; [GUI] TreeSelection _gameTableSelection; @@ -605,21 +603,19 @@ namespace Ryujinx.Ui { Application.Invoke(delegate { - _vSyncStatus.Text = args.VSyncEnabled ? "VSync On" : "VSync Off"; - _hostFpsStatus.Text = args.HostFpsStatus; - _gameFpsStatus.Text = args.GameFpsStatus; - _hostFrameTimeStatus.Text = args.HostFrameTimeStatus; - _gameFrameTimeStatus.Text = args.GameFrameTimeStatus; + _vSyncStatus.Text = "VSync"; + _hostStatus.Text = args.HostStatus; + _gameStatus.Text = args.GameStatus; if (args.VSyncEnabled) { _vSyncStatus.Attributes = new Pango.AttrList(); - _vSyncStatus.Attributes.Insert(new Pango.AttrForeground(0, ushort.MaxValue, 0)); + _vSyncStatus.Attributes.Insert(new Pango.AttrForeground(11822, 60138, 51657)); } else { _vSyncStatus.Attributes = new Pango.AttrList(); - _vSyncStatus.Attributes.Insert(new Pango.AttrForeground(ushort.MaxValue, 0, 0)); + _vSyncStatus.Attributes.Insert(new Pango.AttrForeground(ushort.MaxValue, 17733, 21588)); } }); } diff --git a/Ryujinx/Ui/MainWindow.glade b/Ryujinx/Ui/MainWindow.glade index 0007275a99..91bd375b8a 100644 --- a/Ryujinx/Ui/MainWindow.glade +++ b/Ryujinx/Ui/MainWindow.glade @@ -496,7 +496,7 @@ - + True False start @@ -521,57 +521,7 @@ - - True - False - start - 5 - 5 - - - False - True - 4 - - - - - True - False - - - False - True - 5 - - - - - True - False - start - 5 - 5 - - - False - True - 6 - - - - - True - False - - - False - True - 7 - - - - + True False start @@ -580,7 +530,7 @@ True True - 8 + 4 diff --git a/Ryujinx/Ui/StatusUpdatedEventArgs.cs b/Ryujinx/Ui/StatusUpdatedEventArgs.cs index f5d90ff5c3..f649e99103 100644 --- a/Ryujinx/Ui/StatusUpdatedEventArgs.cs +++ b/Ryujinx/Ui/StatusUpdatedEventArgs.cs @@ -4,10 +4,8 @@ namespace Ryujinx.Ui { public class StatusUpdatedEventArgs : EventArgs { - public bool VSyncEnabled { get; set; } - public string HostFpsStatus { get; set; } - public string GameFpsStatus { get; set; } - public string HostFrameTimeStatus { get; set; } - public string GameFrameTimeStatus { get; set; } + public bool VSyncEnabled { get; set; } + public string HostStatus { get; set; } + public string GameStatus { get; set; } } } \ No newline at end of file