h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 18:32:55 +08:00
Code Issues Releases Wiki Activity

Rename UsingClosestAnchor

Browse Source 
It is now "OverridesClosestAnchor". The logic is inverted accordingly.
This commit is contained in:
Robin Avery 2021-06-07 00:14:36 -04:00
parent f28916e30f
commit 133d72a8c0
No known key found for this signature in database
GPG Key ID: 0496DF10CEF7E226
15 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Extensions/DrawableExtensions.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Extensions
component.Origin = info.Origin;
if (component is ISkinnableDrawable skinnable)
skinnable.UsingClosestAnchor = info.UsingClosestAnchor;
skinnable.OverridesClosestAnchor = info.OverridesClosestAnchor;
if (component is Container container)
{

2
osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.Screens.Play.HUD
[Resolved(canBeNull: true)]
private HUDOverlay hud { get; set; }
public bool UsingClosestAnchor { get; set; } = true;
public bool OverridesClosestAnchor { get; set; }
[BackgroundDependencyLoader]
private void load(OsuColour colours)

2
osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play.HUD
[Resolved(canBeNull: true)]
private HUDOverlay hud { get; set; }
public bool UsingClosestAnchor { get; set; } = true;
public bool OverridesClosestAnchor { get; set; }
public DefaultComboCounter()
{

2
osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
View File

@ -72,7 +72,7 @@ namespace osu.Game.Screens.Play.HUD
}
}
public bool UsingClosestAnchor { get; set; } = true;
public bool OverridesClosestAnchor { get; set; }
public DefaultHealthDisplay()
{

2
osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Screens.Play.HUD
[Resolved(canBeNull: true)]
private HUDOverlay hud { get; set; }
public bool UsingClosestAnchor { get; set; } = true;
public bool OverridesClosestAnchor { get; set; }
[BackgroundDependencyLoader]
private void load(OsuColour colours)

2
osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
[Resolved]
private OsuColour colours { get; set; }
public bool UsingClosestAnchor { get; set; } = true;
public bool OverridesClosestAnchor { get; set; }
[BackgroundDependencyLoader(true)]
private void load(DrawableRuleset drawableRuleset)

2
osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Screens.Play.HUD
set => counterContainer.Alpha = value ? 1 : 0;
}
public bool UsingClosestAnchor { get; set; } = true;
public bool OverridesClosestAnchor { get; set; }
public LegacyComboCounter()
{

8
osu.Game/Screens/Play/HUD/SkinnableInfo.cs
View File

@ -32,8 +32,8 @@ namespace osu.Game.Screens.Play.HUD
public Anchor Origin { get; set; }
/// <inheritdoc cref="ISkinnableDrawable.UsingClosestAnchor"/>
public bool UsingClosestAnchor { get; set; } = true;
/// <inheritdoc cref="ISkinnableDrawable.OverridesClosestAnchor"/>
public bool OverridesClosestAnchor { get; set; }
public List<SkinnableInfo> Children { get; } = new List<SkinnableInfo>();
@ -56,9 +56,7 @@ namespace osu.Game.Screens.Play.HUD
Anchor = component.Anchor;
Origin = component.Origin;
UsingClosestAnchor =
// true if it's not an ISkinnableDrawable
!(component is ISkinnableDrawable skinnable) || skinnable.UsingClosestAnchor;
OverridesClosestAnchor = component is ISkinnableDrawable { OverridesClosestAnchor: true };
if (component is Container<Drawable> container)
{

2
osu.Game/Screens/Play/SongProgress.cs
View File

@ -78,7 +78,7 @@ namespace osu.Game.Screens.Play
private IClock referenceClock;
public bool UsingClosestAnchor { get; set; } = true;
public bool OverridesClosestAnchor { get; set; }
public SongProgress()
{

16
osu.Game/Skinning/Editor/SkinSelectionHandler.cs
View File

@ -241,7 +241,7 @@ namespace osu.Game.Skinning.Editor
private void updateDrawableAnchorIfUsingClosest(Drawable drawable)
{
if (!(drawable is ISkinnableDrawable { UsingClosestAnchor: true })) return;
if (drawable is ISkinnableDrawable { OverridesClosestAnchor: true }) return;
var closestAnchor = getClosestAnchorForDrawable(drawable);
@ -266,9 +266,9 @@ namespace osu.Game.Skinning.Editor
protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<ISkinnableDrawable>> selection)
{
static int checkAnchor(Drawable drawable) =>
drawable is ISkinnableDrawable { UsingClosestAnchor: true }
? closest_text_hash
: (int)drawable.Anchor;
drawable is ISkinnableDrawable { OverridesClosestAnchor: true }
? (int)drawable.Anchor
: closest_text_hash;
yield return new OsuMenuItem(nameof(Anchor))
{
@ -331,12 +331,12 @@ namespace osu.Game.Skinning.Editor
{
var drawable = (Drawable)item;
var (usingClosest, anchor) =
var (overridesClosest, anchor) =
hash == closest_text_hash
? (true, getClosestAnchorForDrawable(drawable))
: (false, (Anchor)hash);
? (false, getClosestAnchorForDrawable(drawable))
: (true, (Anchor)hash);
item.UsingClosestAnchor = usingClosest;
item.OverridesClosestAnchor = overridesClosest;
updateDrawableAnchor(drawable, anchor);
}
}

6
osu.Game/Skinning/ISkinnableDrawable.cs
View File

@ -16,9 +16,9 @@ namespace osu.Game.Skinning
bool IsEditable => true;
/// <summary>
/// <see langword="true"/> if this <see cref="ISkinnableDrawable"/>'s <see cref="Drawable.Anchor"/> is automatically determined by proximity,
/// <see langword="false"/> if the user has overridden it.
/// <see langword="false"/> if this <see cref="ISkinnableDrawable"/>'s <see cref="Drawable.Anchor"/> is automatically determined by proximity,
/// <see langword="true"/> if the user has overridden it.
/// </summary>
bool UsingClosestAnchor { get; set; }
bool OverridesClosestAnchor { get; set; }
}
}

2
osu.Game/Skinning/LegacyAccuracyCounter.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.Skinning
{
public class LegacyAccuracyCounter : GameplayAccuracyCounter, ISkinnableDrawable
{
public bool UsingClosestAnchor { get; set; } = true;
public bool OverridesClosestAnchor { get; set; }
public LegacyAccuracyCounter()
{

2
osu.Game/Skinning/LegacyHealthDisplay.cs
View File

@ -30,7 +30,7 @@ namespace osu.Game.Skinning
private bool isNewStyle;
public bool UsingClosestAnchor { get; set; } = true;
public bool OverridesClosestAnchor { get; set; }
[BackgroundDependencyLoader]
private void load()

2
osu.Game/Skinning/LegacyScoreCounter.cs
View File

@ -13,7 +13,7 @@ namespace osu.Game.Skinning
protected override double RollingDuration => 1000;
protected override Easing RollingEasing => Easing.Out;
public bool UsingClosestAnchor { get; set; } = true;
public bool OverridesClosestAnchor { get; set; }
public LegacyScoreCounter()
: base(6)

2
osu.Game/Skinning/SkinnableTargetComponentsContainer.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Skinning
{
public bool IsEditable => false;
public bool UsingClosestAnchor { get; set; } = true;
public bool OverridesClosestAnchor { get; set; }
private readonly Action<Container> applyDefaults;