sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-20 21:17:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into search-filter

Browse Source
This commit is contained in:
solstice23 2022-07-21 19:04:02 +08:00 committed by GitHub
commit b36243c0c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
osu.Game/Graphics/UserInterface/FPSCounter.cs
View File

@ -29,6 +29,8 @@ namespace osu.Game.Graphics.UserInterface
private Container background = null!; private Container background = null!;
private Container counters = null!;
private const float idle_background_alpha = 0.4f; private const float idle_background_alpha = 0.4f;
private readonly BindableBool showFpsDisplay = new BindableBool(true); private readonly BindableBool showFpsDisplay = new BindableBool(true);
@ -49,7 +51,7 @@ namespace osu.Game.Graphics.UserInterface
mainContent = new Container mainContent = new Container
{ {
Alpha = 0, Alpha = 0,
Size = new Vector2(42, 26), Height = 26,
Children = new Drawable[] Children = new Drawable[]
{ {
background = new Container background = new Container
@ -68,21 +70,30 @@ namespace osu.Game.Graphics.UserInterface
}, },
} }
}, },
counterUpdateFrameTime = new FrameTimeCounter counters = new Container
{ {
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Margin = new MarginPadding(1), AutoSizeAxes = Axes.Both,
Y = -2, Children = new Drawable[]
{
counterUpdateFrameTime = new FrameTimeCounter
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
Margin = new MarginPadding(1),
Y = -2,
},
counterDrawFPS = new FramesPerSecondCounter
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
Margin = new MarginPadding(2),
Y = 10,
Scale = new Vector2(0.8f),
}
}
}, },
counterDrawFPS = new FramesPerSecondCounter
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
Margin = new MarginPadding(2),
Y = 10,
Scale = new Vector2(0.8f),
}
} }
}, },
}; };
@ -159,6 +170,8 @@ namespace osu.Game.Graphics.UserInterface
{ {
base.Update(); base.Update();
mainContent.Width = Math.Max(mainContent.Width, counters.DrawWidth);
// Handle the case where the window has become inactive or the user changed the // Handle the case where the window has become inactive or the user changed the
// frame limiter (we want to show the FPS as it's changing, even if it isn't an outlier). // frame limiter (we want to show the FPS as it's changing, even if it isn't an outlier).
bool aimRatesChanged = updateAimFPS(); bool aimRatesChanged = updateAimFPS();