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

Hide inactive and pause

Browse source
This commit is contained in:
Andy Adshead 2019-01-26 20:00:32 +00:00
commit 570a93f1ce
1 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Ryujinx.Profiler/UI/ProfileWindow.cs
View file

@ -22,7 +22,8 @@ namespace Ryujinx
AverageTitle = 2, AverageTitle = 2,
TotalTitle = 3, TotalTitle = 3,
FilterBar = 4, FilterBar = 4,
ShowHideInactive = 5 ShowHideInactive = 5,
Pause = 6,
} }
private bool visible = true, initComplete = false; private bool visible = true, initComplete = false;
@ -39,7 +40,7 @@ namespace Ryujinx
private string FilterText = ""; private string FilterText = "";
private double BackspaceDownTime, UpdateTimer; private double BackspaceDownTime, UpdateTimer;
private bool BackspaceDown = false, prevBackspaceDown = false, regexEnabled = false, ProfileUpdated = false; private bool BackspaceDown = false, prevBackspaceDown = false, regexEnabled = false, ProfileUpdated = false;
private bool showInactive = true; private bool showInactive = true, Paused = false;
public ProfileWindow() public ProfileWindow()
: base(400, 720) : base(400, 720)
@ -73,7 +74,7 @@ namespace Ryujinx
fontService.InitalizeTextures(); fontService.InitalizeTextures();
fontService.UpdateScreenHeight(Height); fontService.UpdateScreenHeight(Height);
buttons = new ProfileButton[6]; buttons = new ProfileButton[7];
buttons[(int)ButtonIndex.TagTitle] = new ProfileButton(fontService, () => sortAction = new ProfileSorters.TagAscending()); buttons[(int)ButtonIndex.TagTitle] = new ProfileButton(fontService, () => sortAction = new ProfileSorters.TagAscending());
buttons[(int)ButtonIndex.InstantTitle] = new ProfileButton(fontService, () => sortAction = new ProfileSorters.InstantAscending()); buttons[(int)ButtonIndex.InstantTitle] = new ProfileButton(fontService, () => sortAction = new ProfileSorters.InstantAscending());
buttons[(int)ButtonIndex.AverageTitle] = new ProfileButton(fontService, () => sortAction = new ProfileSorters.AverageAscending()); buttons[(int)ButtonIndex.AverageTitle] = new ProfileButton(fontService, () => sortAction = new ProfileSorters.AverageAscending());
@ -88,6 +89,11 @@ namespace Ryujinx
ProfileUpdated = true; ProfileUpdated = true;
showInactive = !showInactive; showInactive = !showInactive;
}); });
buttons[(int)ButtonIndex.Pause] = new ProfileButton(fontService, () =>
{
ProfileUpdated = true;
Paused = !Paused;
});
} }
#endregion #endregion
@ -154,7 +160,7 @@ namespace Ryujinx
// Get timing data if enough time has passed // Get timing data if enough time has passed
UpdateTimer += e.Time; UpdateTimer += e.Time;
if (UpdateTimer > Profile.GetUpdateRate()) if (!Paused && (UpdateTimer > Profile.GetUpdateRate()))
{ {
UpdateTimer %= Profile.GetUpdateRate(); UpdateTimer %= Profile.GetUpdateRate();
rawPofileData = Profile.GetProfilingData().ToList(); rawPofileData = Profile.GetProfilingData().ToList();
@ -425,11 +431,14 @@ namespace Ryujinx
buttons[(int)ButtonIndex.TotalTitle].UpdateSize((int)(columnSpacing + columnSpacing + 200 + xOffset), (int)yHeight, 0, Width, titleFontHeight); buttons[(int)ButtonIndex.TotalTitle].UpdateSize((int)(columnSpacing + columnSpacing + 200 + xOffset), (int)yHeight, 0, Width, titleFontHeight);
// Show/Hide Inactive // Show/Hide Inactive
width = buttons[(int)ButtonIndex.ShowHideInactive].UpdateSize($"{(showInactive ? "Hide" : "Show")} Inactive", 5, 5, 4, 16); float widthShowHideButton = buttons[(int)ButtonIndex.ShowHideInactive].UpdateSize($"{(showInactive ? "Hide" : "Show")} Inactive", 5, 5, 4, 16);
// Play/Pause
width = buttons[(int)ButtonIndex.Pause].UpdateSize(Paused ? "Play" : "Pause", 15 + (int)widthShowHideButton, 5, 4, 16) + widthShowHideButton;
// Filter bar // Filter bar
fontService.DrawText($"{(regexEnabled ? "Regex " : "Filter")}: {FilterText}", 15 + width, 7, 16); fontService.DrawText($"{(regexEnabled ? "Regex " : "Filter")}: {FilterText}", 25 + width, 7, 16);
buttons[(int) ButtonIndex.FilterBar].UpdateSize((int)(15 + width), 0, 0, Width, filterHeight); buttons[(int) ButtonIndex.FilterBar].UpdateSize((int)(25 + width), 0, 0, Width, filterHeight);
// Draw buttons // Draw buttons
foreach (ProfileButton button in buttons) foreach (ProfileButton button in buttons)
@ -449,8 +458,11 @@ namespace Ryujinx
GL.Vertex2(Width, filterHeight); GL.Vertex2(Width, filterHeight);
// Bottom vertical divider // Bottom vertical divider
GL.Vertex2(width + 10, 0); GL.Vertex2(widthShowHideButton + 10, 0);
GL.Vertex2(width + 10, filterHeight); GL.Vertex2(widthShowHideButton + 10, filterHeight);
GL.Vertex2(width + 20, 0);
GL.Vertex2(width + 20, filterHeight);
GL.End(); GL.End();
SwapBuffers(); SwapBuffers();
} }