diff --git a/osu-resources b/osu-resources index 2a3dd3f3dd..51f2b9b37f 160000 --- a/osu-resources +++ b/osu-resources @@ -1 +1 @@ -Subproject commit 2a3dd3f3dd68fe52b779d0fdded3ce444897efee +Subproject commit 51f2b9b37f38cd349a3dd728a78f8fffcb3a54f5 diff --git a/osu.Desktop/Overlays/VersionManager.cs b/osu.Desktop/Overlays/VersionManager.cs index 4806206d07..90a07d58ee 100644 --- a/osu.Desktop/Overlays/VersionManager.cs +++ b/osu.Desktop/Overlays/VersionManager.cs @@ -6,6 +6,10 @@ using osu.Game.Overlays; using osu.Game.Overlays.Notifications; using Squirrel; using System.Reflection; +using osu.Framework.Graphics.Sprites; +using osu.Framework.Graphics.Textures; +using osu.Game.Graphics; +using OpenTK; namespace osu.Desktop.Overlays { @@ -16,20 +20,63 @@ namespace osu.Desktop.Overlays protected override bool HideOnEscape => false; + public override bool HandleInput => false; + [BackgroundDependencyLoader] - private void load(NotificationManager notification) + private void load(NotificationManager notification, OsuColour colours, TextureStore textures) { this.notification = notification; AutoSizeAxes = Axes.Both; Anchor = Anchor.BottomCentre; Origin = Anchor.BottomCentre; + Alpha = 0; var asm = Assembly.GetEntryAssembly().GetName(); - Add(new OsuSpriteText + Children = new Drawable[] { - Text = $@"osu!lazer v{asm.Version}" - }); + new FlowContainer + { + AutoSizeAxes = Axes.Both, + Direction = FlowDirections.Vertical, + Children = new Drawable[] + { + new FlowContainer + { + AutoSizeAxes = Axes.Both, + Direction = FlowDirections.Horizontal, + Anchor = Anchor.TopCentre, + Origin = Anchor.TopCentre, + Spacing = new Vector2(5), + Children = new Drawable[] + { + new OsuSpriteText + { + Font = @"Exo2.0-Bold", + Text = $@"osu!lazer" + }, + new OsuSpriteText + { + Text = $@"{asm.Version}" + }, + } + }, + new OsuSpriteText + { + Anchor = Anchor.TopCentre, + Origin = Anchor.TopCentre, + TextSize = 12, + Colour = colours.Yellow, + Font = @"Venera", + Text = $@"Development Build" + }, + new Sprite + { + Texture = textures.Get(@"Menu/dev-build-footer"), + }, + } + } + }; updateChecker(); } @@ -77,6 +124,7 @@ namespace osu.Desktop.Overlays protected override void PopIn() { + FadeIn(1000); } protected override void PopOut()