ryujinx/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-11-08 04:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Docked/Handheld text on status bar (#1205)

Browse source 
* Add Dock/Handheld on status bar

* Simplified the code & move next to V-Sync

* Nit.
This commit is contained in:
HorrorTroll 2020-05-05 05:10:01 +07:00 committed by GitHub
parent f84fb20959
commit 371b9999f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Ryujinx/Ui/GLRenderer.cs
View file

@ -326,6 +326,8 @@ namespace Ryujinx.Ui
_device.ProcessFrame(); _device.ProcessFrame();
} }
string dockedMode = ConfigurationState.Instance.System.EnableDockedMode ? "Docked" : "Handheld";
if (_ticks >= _ticksPerFrame) if (_ticks >= _ticksPerFrame)
{ {
_device.PresentFrame(SwapBuffers); _device.PresentFrame(SwapBuffers);
@ -334,6 +336,7 @@ namespace Ryujinx.Ui
StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs( StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs(
_device.EnableDeviceVsync, _device.EnableDeviceVsync,
dockedMode,
$"Host: {_device.Statistics.GetSystemFrameRate():00.00} FPS", $"Host: {_device.Statistics.GetSystemFrameRate():00.00} FPS",
$"Game: {_device.Statistics.GetGameFrameRate():00.00} FPS", $"Game: {_device.Statistics.GetGameFrameRate():00.00} FPS",
$"GPU: {_renderer.GpuVendor}")); $"GPU: {_renderer.GpuVendor}"));

2
Ryujinx/Ui/MainWindow.cs
View file

@ -66,6 +66,7 @@ namespace Ryujinx.Ui
[GUI] CheckMenuItem _fileExtToggle; [GUI] CheckMenuItem _fileExtToggle;
[GUI] CheckMenuItem _pathToggle; [GUI] CheckMenuItem _pathToggle;
[GUI] CheckMenuItem _fileSizeToggle; [GUI] CheckMenuItem _fileSizeToggle;
[GUI] Label _dockedMode;
[GUI] Label _gameStatus; [GUI] Label _gameStatus;
[GUI] TreeView _gameTable; [GUI] TreeView _gameTable;
[GUI] TreeSelection _gameTableSelection; [GUI] TreeSelection _gameTableSelection;
@ -665,6 +666,7 @@ namespace Ryujinx.Ui
_hostStatus.Text = args.HostStatus; _hostStatus.Text = args.HostStatus;
_gameStatus.Text = args.GameStatus; _gameStatus.Text = args.GameStatus;
_gpuName.Text = args.GpuName; _gpuName.Text = args.GpuName;
_dockedMode.Text = args.DockedMode;
if (args.VSyncEnabled) if (args.VSyncEnabled)
{ {

31
Ryujinx/Ui/MainWindow.glade
View file

@ -494,7 +494,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="_hostStatus"> <object class="GtkLabel" id="_dockedMode">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
@ -519,7 +519,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="_gameStatus"> <object class="GtkLabel" id="_hostStatus">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
@ -543,6 +543,31 @@
<property name="position">5</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="_gameStatus">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">7</property>
</packing>
</child>
<child> <child>
<object class="GtkLabel" id="_gpuName"> <object class="GtkLabel" id="_gpuName">
<property name="visible">True</property> <property name="visible">True</property>
@ -553,7 +578,7 @@
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">6</property> <property name="position">8</property>
</packing> </packing>
</child> </child>
</object> </object>

4
Ryujinx/Ui/StatusUpdatedEventArgs.cs
View file

@ -5,13 +5,15 @@ namespace Ryujinx.Ui
public class StatusUpdatedEventArgs : EventArgs public class StatusUpdatedEventArgs : EventArgs
{ {
public bool VSyncEnabled; public bool VSyncEnabled;
public string DockedMode;
public string HostStatus; public string HostStatus;
public string GameStatus; public string GameStatus;
public string GpuName; public string GpuName;
public StatusUpdatedEventArgs(bool vSyncEnabled, string hostStatus, string gameStatus, string gpuName) public StatusUpdatedEventArgs(bool vSyncEnabled, string dockedMode, string hostStatus, string gameStatus, string gpuName)
{ {
VSyncEnabled = vSyncEnabled; VSyncEnabled = vSyncEnabled;
DockedMode = dockedMode;
HostStatus = hostStatus; HostStatus = hostStatus;
GameStatus = gameStatus; GameStatus = gameStatus;
GpuName = gpuName; GpuName = gpuName;