sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-07 20:37:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Scale -> Rect to read better

Browse Source
This commit is contained in:
Dean Herbert 2022-03-02 20:33:28 +09:00
parent 8d7cdbd883
commit b5684aaa76
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,16 +39,16 @@ namespace osu.Game.Graphics.Containers
private BackgroundScreenStack backgroundStack; private BackgroundScreenStack backgroundStack;
private RectangleF? customScale; private RectangleF? customRect;
private bool customScaleIsRelativePosition; private bool customRectIsRelativePosition;
/// <summary> /// <summary>
/// Set a custom position and scale which overrides any user specification. /// Set a custom position and scale which overrides any user specification.
/// </summary> /// </summary>
public void SetCustomScale(RectangleF? scale, bool relativePosition = false) public void SetCustomRect(RectangleF? rect, bool relativePosition = false)
{ {
customScale = scale; customRect = rect;
customScaleIsRelativePosition = relativePosition; customRectIsRelativePosition = relativePosition;
if (IsLoaded) Scheduler.AddOnce(updateSize); if (IsLoaded) Scheduler.AddOnce(updateSize);
} }
@ -161,13 +161,13 @@ namespace osu.Game.Graphics.Containers
backgroundStack?.FadeOut(duration); backgroundStack?.FadeOut(duration);
} }
RectangleF targetSize = new RectangleF(Vector2.Zero, Vector2.One); RectangleF targetRect = new RectangleF(Vector2.Zero, Vector2.One);
if (customScale != null) if (customRect != null)
{ {
sizableContainer.RelativePositionAxes = customScaleIsRelativePosition ? Axes.Both : Axes.None; sizableContainer.RelativePositionAxes = customRectIsRelativePosition ? Axes.Both : Axes.None;
targetSize = customScale.Value; targetRect = customRect.Value;
} }
else if (targetMode == null || scalingMode.Value == targetMode) else if (targetMode == null || scalingMode.Value == targetMode)
{ {
@ -176,10 +176,10 @@ namespace osu.Game.Graphics.Containers
Vector2 scale = new Vector2(sizeX.Value, sizeY.Value); Vector2 scale = new Vector2(sizeX.Value, sizeY.Value);
Vector2 pos = new Vector2(posX.Value, posY.Value) * (Vector2.One - scale); Vector2 pos = new Vector2(posX.Value, posY.Value) * (Vector2.One - scale);
targetSize = new RectangleF(pos, scale); targetRect = new RectangleF(pos, scale);
} }
bool requiresMasking = targetSize.Size != Vector2.One bool requiresMasking = targetRect.Size != Vector2.One
// For the top level scaling container, for now we apply masking if safe areas are in use. // For the top level scaling container, for now we apply masking if safe areas are in use.
// In the future this can likely be removed as more of the actual UI supports overflowing into the safe areas. // In the future this can likely be removed as more of the actual UI supports overflowing into the safe areas.
|| (targetMode == ScalingMode.Everything && safeAreaPadding.Value.Total != Vector2.Zero); || (targetMode == ScalingMode.Everything && safeAreaPadding.Value.Total != Vector2.Zero);
@ -187,8 +187,8 @@ namespace osu.Game.Graphics.Containers
if (requiresMasking) if (requiresMasking)
sizableContainer.Masking = true; sizableContainer.Masking = true;
sizableContainer.MoveTo(targetSize.Location, duration, Easing.OutQuart); sizableContainer.MoveTo(targetRect.Location, duration, Easing.OutQuart);
sizableContainer.ResizeTo(targetSize.Size, duration, Easing.OutQuart); sizableContainer.ResizeTo(targetRect.Size, duration, Easing.OutQuart);
// Of note, this will not working great in the case of nested ScalingContainers where multiple are applying corner radius. // 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. // There should likely only be masking and corner radius applied at one point in the full game stack to fix this.

4
osu.Game/Skinning/Editor/SkinEditorOverlay.cs
View File

@ -101,11 +101,11 @@ namespace osu.Game.Skinning.Editor
{ {
if (visibility.NewValue == Visibility.Visible) if (visibility.NewValue == Visibility.Visible)
{ {
target.SetCustomScale(new RectangleF(0.18f, 0.1f, VISIBLE_TARGET_SCALE, VISIBLE_TARGET_SCALE), true); target.SetCustomRect(new RectangleF(0.18f, 0.1f, VISIBLE_TARGET_SCALE, VISIBLE_TARGET_SCALE), true);
} }
else else
{ {
target.SetCustomScale(null); target.SetCustomRect(null);
} }
} }