fix merge changes

This commit is contained in:
Jorolf 2017-08-22 13:35:30 +02:00
parent 2ccd6c6128
commit c29d3437ba
1 changed files with 3 additions and 3 deletions

View File

@ -22,7 +22,7 @@ public OsuPasswordTextBox()
{
Add(new CapsWarning
{
TextSize = 20,
Size = new Vector2(20),
});
}
@ -63,7 +63,7 @@ protected override void LoadComplete()
}
}
private class CapsWarning : TextAwesome, IHasTooltip
private class CapsWarning : SpriteIcon, IHasTooltip
{
public string TooltipText => Console.CapsLock ? @"Caps lock is active" : string.Empty;
@ -91,7 +91,7 @@ protected override void Update()
updateVisibility();
}
private void updateVisibility() => FadeTo(Console.CapsLock ? 1 : 0, 250, EasingTypes.OutQuint);
private void updateVisibility() => this.FadeTo(Console.CapsLock ? 1 : 0, 250, Easing.OutQuint);
}
}
}