h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:37:28 +08:00
Code Issues Releases Wiki Activity

Rename OverridesClosestAnchor to UsesFixedAnchor

Browse Source
This commit is contained in:
Robin Avery 2021-06-08 08:22:35 -04:00
parent 65f594f860
commit dc50ae40b9
No known key found for this signature in database
GPG Key ID: 0496DF10CEF7E226
15 changed files with 22 additions and 22 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.OverridesClosestAnchor = info.OverridesClosestAnchor;
skinnable.UsesFixedAnchor = info.UsesFixedAnchor;
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 OverridesClosestAnchor { get; set; }
public bool UsesFixedAnchor { 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 OverridesClosestAnchor { get; set; }
public bool UsesFixedAnchor { 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 OverridesClosestAnchor { get; set; }
public bool UsesFixedAnchor { 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 OverridesClosestAnchor { get; set; }
public bool UsesFixedAnchor { 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 OverridesClosestAnchor { get; set; }
public bool UsesFixedAnchor { 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 OverridesClosestAnchor { get; set; }
public bool UsesFixedAnchor { get; set; }
public LegacyComboCounter()
{

6
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.OverridesClosestAnchor"/>
public bool OverridesClosestAnchor { get; set; }
/// <inheritdoc cref="ISkinnableDrawable.UsesFixedAnchor"/>
public bool UsesFixedAnchor { get; set; }
public List<SkinnableInfo> Children { get; } = new List<SkinnableInfo>();
@ -57,7 +57,7 @@ namespace osu.Game.Screens.Play.HUD
Origin = component.Origin;
if (component is ISkinnableDrawable skinnable)
OverridesClosestAnchor = skinnable.OverridesClosestAnchor;
UsesFixedAnchor = skinnable.UsesFixedAnchor;
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 OverridesClosestAnchor { get; set; }
public bool UsesFixedAnchor { get; set; }
public SongProgress()
{

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

@ -160,7 +160,7 @@ namespace osu.Game.Skinning.Editor
private void updateDrawableAnchorIfUsingClosest(ISkinnableDrawable item)
{
if (item.OverridesClosestAnchor) return;
if (item.UsesFixedAnchor) return;
var drawable = (Drawable)item;
@ -188,12 +188,12 @@ namespace osu.Game.Skinning.Editor
{
var closestItem = new TernaryStateRadioMenuItem("Closest", MenuItemType.Standard, _ => applyClosestAnchor())
{
State = { Value = GetStateFromSelection(selection, c => !c.Item.OverridesClosestAnchor) }
State = { Value = GetStateFromSelection(selection, c => !c.Item.UsesFixedAnchor) }
};
yield return new OsuMenuItem("Anchor")
{
Items = createAnchorItems((i, a) => i.OverridesClosestAnchor && ((Drawable)i).Anchor == a, applyCustomAnchor)
Items = createAnchorItems((i, a) => i.UsesFixedAnchor && ((Drawable)i).Anchor == a, applyCustomAnchor)
.Prepend(closestItem)
.ToArray()
};
@ -261,7 +261,7 @@ namespace osu.Game.Skinning.Editor
{
var drawable = (Drawable)item;
item.OverridesClosestAnchor = true;
item.UsesFixedAnchor = true;
updateDrawableAnchor(drawable, anchor);
}
}
@ -272,7 +272,7 @@ namespace osu.Game.Skinning.Editor
{
var drawable = (Drawable)item;
item.OverridesClosestAnchor = false;
item.UsesFixedAnchor = false;
updateDrawableAnchor(drawable, getClosestAnchorForDrawable(drawable));
}
}

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

@ -17,8 +17,8 @@ namespace osu.Game.Skinning
/// <summary>
/// <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.
/// <see langword="true"/> if the user has chosen a fixed anchor point.
/// </summary>
bool OverridesClosestAnchor { get; set; }
bool UsesFixedAnchor { 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 OverridesClosestAnchor { get; set; }
public bool UsesFixedAnchor { 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 OverridesClosestAnchor { get; set; }
public bool UsesFixedAnchor { 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 OverridesClosestAnchor { get; set; }
public bool UsesFixedAnchor { 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 OverridesClosestAnchor { get; set; }
public bool UsesFixedAnchor { get; set; }
private readonly Action<Container> applyDefaults;