mirror of
https://github.com/ppy/osu.git
synced 2025-02-22 06:42:54 +08:00
fix merge changes
This commit is contained in:
parent
2ccd6c6128
commit
c29d3437ba
@ -22,7 +22,7 @@ namespace osu.Game.Graphics.UserInterface
|
|||||||
{
|
{
|
||||||
Add(new CapsWarning
|
Add(new CapsWarning
|
||||||
{
|
{
|
||||||
TextSize = 20,
|
Size = new Vector2(20),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -63,7 +63,7 @@ namespace osu.Game.Graphics.UserInterface
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private class CapsWarning : TextAwesome, IHasTooltip
|
private class CapsWarning : SpriteIcon, IHasTooltip
|
||||||
{
|
{
|
||||||
public string TooltipText => Console.CapsLock ? @"Caps lock is active" : string.Empty;
|
public string TooltipText => Console.CapsLock ? @"Caps lock is active" : string.Empty;
|
||||||
|
|
||||||
@ -91,7 +91,7 @@ namespace osu.Game.Graphics.UserInterface
|
|||||||
updateVisibility();
|
updateVisibility();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateVisibility() => FadeTo(Console.CapsLock ? 1 : 0, 250, EasingTypes.OutQuint);
|
private void updateVisibility() => this.FadeTo(Console.CapsLock ? 1 : 0, 250, Easing.OutQuint);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user