Rename OverridesClosestAnchor to UsesFixedAnchor

This commit is contained in:
Robin Avery
2021-06-08 08:22:35 -04:00
parent 65f594f860
commit dc50ae40b9
15 changed files with 22 additions and 22 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -32,8 +32,8 @@ namespace osu.Game.Screens.Play.HUD
public Anchor Origin { get; set; } public Anchor Origin { get; set; }
/// <inheritdoc cref="ISkinnableDrawable.OverridesClosestAnchor"/> /// <inheritdoc cref="ISkinnableDrawable.UsesFixedAnchor"/>
public bool OverridesClosestAnchor { get; set; } public bool UsesFixedAnchor { get; set; }
public List<SkinnableInfo> Children { get; } = new List<SkinnableInfo>(); public List<SkinnableInfo> Children { get; } = new List<SkinnableInfo>();
@ -57,7 +57,7 @@ namespace osu.Game.Screens.Play.HUD
Origin = component.Origin; Origin = component.Origin;
if (component is ISkinnableDrawable skinnable) if (component is ISkinnableDrawable skinnable)
OverridesClosestAnchor = skinnable.OverridesClosestAnchor; UsesFixedAnchor = skinnable.UsesFixedAnchor;
if (component is Container<Drawable> container) if (component is Container<Drawable> container)
{ {

View File

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

View File

@ -160,7 +160,7 @@ namespace osu.Game.Skinning.Editor
private void updateDrawableAnchorIfUsingClosest(ISkinnableDrawable item) private void updateDrawableAnchorIfUsingClosest(ISkinnableDrawable item)
{ {
if (item.OverridesClosestAnchor) return; if (item.UsesFixedAnchor) return;
var drawable = (Drawable)item; var drawable = (Drawable)item;
@ -188,12 +188,12 @@ namespace osu.Game.Skinning.Editor
{ {
var closestItem = new TernaryStateRadioMenuItem("Closest", MenuItemType.Standard, _ => applyClosestAnchor()) 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") 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) .Prepend(closestItem)
.ToArray() .ToArray()
}; };
@ -261,7 +261,7 @@ namespace osu.Game.Skinning.Editor
{ {
var drawable = (Drawable)item; var drawable = (Drawable)item;
item.OverridesClosestAnchor = true; item.UsesFixedAnchor = true;
updateDrawableAnchor(drawable, anchor); updateDrawableAnchor(drawable, anchor);
} }
} }
@ -272,7 +272,7 @@ namespace osu.Game.Skinning.Editor
{ {
var drawable = (Drawable)item; var drawable = (Drawable)item;
item.OverridesClosestAnchor = false; item.UsesFixedAnchor = false;
updateDrawableAnchor(drawable, getClosestAnchorForDrawable(drawable)); updateDrawableAnchor(drawable, getClosestAnchorForDrawable(drawable));
} }
} }

View File

@ -17,8 +17,8 @@ namespace osu.Game.Skinning
/// <summary> /// <summary>
/// <see langword="false"/> if this <see cref="ISkinnableDrawable"/>'s <see cref="Drawable.Anchor"/> is automatically determined by proximity, /// <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> /// </summary>
bool OverridesClosestAnchor { get; set; } bool UsesFixedAnchor { get; set; }
} }
} }

View File

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

View File

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

View File

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

View File

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