sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add note about nested masking case

Browse Source
This commit is contained in:
Dean Herbert
2022-03-02 20:25:34 +09:00
parent 29ed419d53
commit 8d7cdbd883
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Graphics/Containers/ScalingContainer.cs
View File

@ -136,7 +136,7 @@ namespace osu.Game.Graphics.Containers
private void updateSize() private void updateSize()
{ {
const float fade_time = 500; const float duration = 500;
if (targetMode == ScalingMode.Everything) if (targetMode == ScalingMode.Everything)
{ {
@ -155,10 +155,10 @@ namespace osu.Game.Graphics.Containers
backgroundStack.Push(new ScalingBackgroundScreen()); backgroundStack.Push(new ScalingBackgroundScreen());
} }
backgroundStack.FadeIn(fade_time); backgroundStack.FadeIn(duration);
} }
else else
backgroundStack?.FadeOut(fade_time); backgroundStack?.FadeOut(duration);
} }
RectangleF targetSize = new RectangleF(Vector2.Zero, Vector2.One); RectangleF targetSize = new RectangleF(Vector2.Zero, Vector2.One);
@ -187,9 +187,14 @@ namespace osu.Game.Graphics.Containers
if (requiresMasking) if (requiresMasking)
sizableContainer.Masking = true; sizableContainer.Masking = true;
sizableContainer.MoveTo(targetSize.Location, 500, Easing.OutQuart); sizableContainer.MoveTo(targetSize.Location, duration, Easing.OutQuart);
sizableContainer.ResizeTo(targetSize.Size, 500, Easing.OutQuart).OnComplete(_ => { sizableContainer.Masking = requiresMasking; }); sizableContainer.ResizeTo(targetSize.Size, duration, Easing.OutQuart);
sizableContainer.TransformTo(nameof(CornerRadius), requiresMasking ? corner_radius : 0, 500, requiresMasking ? Easing.OutQuart : Easing.None);
// Of note, this will not working great in the case of nested ScalingContainers where multiple are applying corner radius.
// There should likely only be masking and corner radius applied at one point in the full game stack to fix this.
// An example of how this can occur is it the skin editor is visible and the game screen scaling is set to "Everything".
sizableContainer.TransformTo(nameof(CornerRadius), requiresMasking ? corner_radius : 0, duration, requiresMasking ? Easing.OutQuart : Easing.None)
.OnComplete(_ => { sizableContainer.Masking = requiresMasking; });
} }
private class ScalingBackgroundScreen : BackgroundScreenDefault private class ScalingBackgroundScreen : BackgroundScreenDefault