1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-16 00:37:19 +08:00

Merge branch 'master' into first-run-setup-sheared-overlay

This commit is contained in:
Bartłomiej Dach 2022-04-23 00:31:36 +02:00
commit 98b7b156c7
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
84 changed files with 831 additions and 530 deletions

View File

@ -51,8 +51,8 @@
<Reference Include="Java.Interop" /> <Reference Include="Java.Interop" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.417.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2022.422.0" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2022.419.0" /> <PackageReference Include="ppy.osu.Framework.Android" Version="2022.421.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="Transitive Dependencies"> <ItemGroup Label="Transitive Dependencies">
<!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. --> <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->

View File

@ -6,10 +6,10 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Primitives;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Osu.Judgements; using osu.Game.Rulesets.Osu.Judgements;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Rulesets.Osu.UI;
using osuTK; using osuTK;
namespace osu.Game.Rulesets.Osu.Objects.Drawables namespace osu.Game.Rulesets.Osu.Objects.Drawables
@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
// Must be set to update IsHovered as it's used in relax mod to detect osu hit objects. // Must be set to update IsHovered as it's used in relax mod to detect osu hit objects.
public override bool HandlePositionalInput => true; public override bool HandlePositionalInput => true;
protected override float SamplePlaybackPosition => HitObject.X / OsuPlayfield.BASE_SIZE.X; protected override float SamplePlaybackPosition => CalculateDrawableRelativePosition(this);
/// <summary> /// <summary>
/// Whether this <see cref="DrawableOsuHitObject"/> can be hit, given a time value. /// Whether this <see cref="DrawableOsuHitObject"/> can be hit, given a time value.
@ -89,6 +89,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
/// </summary> /// </summary>
public void MissForcefully() => ApplyResult(r => r.Type = r.Judgement.MinResult); public void MissForcefully() => ApplyResult(r => r.Type = r.Judgement.MinResult);
private RectangleF parentScreenSpaceRectangle => ((DrawableOsuHitObject)ParentHitObject)?.parentScreenSpaceRectangle ?? Parent.ScreenSpaceDrawQuad.AABBFloat;
/// <summary>
/// Calculates the position of the given <paramref name="drawable"/> relative to the playfield area.
/// </summary>
/// <param name="drawable">The drawable to calculate its relative position.</param>
protected float CalculateDrawableRelativePosition(Drawable drawable) => (drawable.ScreenSpaceDrawQuad.Centre.X - parentScreenSpaceRectangle.X) / parentScreenSpaceRectangle.Width;
protected override JudgementResult CreateResult(Judgement judgement) => new OsuJudgementResult(HitObject, judgement); protected override JudgementResult CreateResult(Judgement judgement) => new OsuJudgementResult(HitObject, judgement);
} }
} }

View File

@ -13,7 +13,6 @@ using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Osu.Skinning; using osu.Game.Rulesets.Osu.Skinning;
using osu.Game.Rulesets.Osu.Skinning.Default; using osu.Game.Rulesets.Osu.Skinning.Default;
using osu.Game.Rulesets.Osu.UI;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
using osu.Game.Skinning; using osu.Game.Skinning;
using osuTK; using osuTK;
@ -208,7 +207,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
if (Tracking.Value && slidingSample != null) if (Tracking.Value && slidingSample != null)
// keep the sliding sample playing at the current tracking position // keep the sliding sample playing at the current tracking position
slidingSample.Balance.Value = CalculateSamplePlaybackBalance(Ball.X / OsuPlayfield.BASE_SIZE.X); slidingSample.Balance.Value = CalculateSamplePlaybackBalance(CalculateDrawableRelativePosition(Ball));
double completionProgress = Math.Clamp((Time.Current - HitObject.StartTime) / HitObject.Duration, 0, 1); double completionProgress = Math.Clamp((Time.Current - HitObject.StartTime) / HitObject.Duration, 0, 1);

View File

@ -359,9 +359,9 @@ namespace osu.Game.Tests.Visual.Background
protected override BackgroundScreen CreateBackground() => protected override BackgroundScreen CreateBackground() =>
new FadeAccessibleBackground(Beatmap.Value); new FadeAccessibleBackground(Beatmap.Value);
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
ApplyToBackground(b => ReplacesBackground.BindTo(b.StoryboardReplacesBackground)); ApplyToBackground(b => ReplacesBackground.BindTo(b.StoryboardReplacesBackground));
} }

View File

@ -389,9 +389,9 @@ namespace osu.Game.Tests.Visual.Gameplay
public void ExitViaQuickExit() => PerformExit(false); public void ExitViaQuickExit() => PerformExit(false);
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
GameplayClockContainer.Stop(); GameplayClockContainer.Stop();
} }
} }

View File

@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Gameplay
private TestSkinSourceContainer skinSource; private TestSkinSourceContainer skinSource;
private PausableSkinnableSound skinnableSound; private PausableSkinnableSound skinnableSound;
[SetUp] [SetUpSteps]
public void SetUpSteps() public void SetUpSteps()
{ {
AddStep("setup hierarchy", () => AddStep("setup hierarchy", () =>

View File

@ -21,8 +21,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
{ {
State = { Value = Visibility.Visible } State = { Value = Visibility.Visible }
}); });
AddUntilStep("all column content loaded",
() => freeModSelectScreen.ChildrenOfType<ModColumn>().Any()
&& freeModSelectScreen.ChildrenOfType<ModColumn>().All(column => column.IsLoaded && column.ItemsLoaded));
AddAssert("all visible mods are playable", AddUntilStep("all visible mods are playable",
() => this.ChildrenOfType<ModPanel>() () => this.ChildrenOfType<ModPanel>()
.Where(panel => panel.IsPresent) .Where(panel => panel.IsPresent)
.All(panel => panel.Mod.HasImplementation && panel.Mod.UserPlayable)); .All(panel => panel.Mod.HasImplementation && panel.Mod.UserPlayable));

View File

@ -230,7 +230,7 @@ namespace osu.Game.Tests.Visual.Navigation
public int ExitAttempts { get; private set; } public int ExitAttempts { get; private set; }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
ExitAttempts++; ExitAttempts++;
@ -240,7 +240,7 @@ namespace osu.Game.Tests.Visual.Navigation
return true; return true;
} }
return base.OnExiting(next); return base.OnExiting(e);
} }
} }
@ -257,7 +257,7 @@ namespace osu.Game.Tests.Visual.Navigation
SubScreenStack.Push(Blocker = new DialogBlockingScreen()); SubScreenStack.Push(Blocker = new DialogBlockingScreen());
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
if (SubScreenStack.CurrentScreen != null) if (SubScreenStack.CurrentScreen != null)
{ {
@ -265,7 +265,7 @@ namespace osu.Game.Tests.Visual.Navigation
return true; return true;
} }
return base.OnExiting(next); return base.OnExiting(e);
} }
} }
} }

View File

@ -0,0 +1,188 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Testing;
using osu.Framework.Utils;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Chat;
using osu.Game.Overlays;
using osu.Game.Overlays.Chat.ChannelList;
namespace osu.Game.Tests.Visual.Online
{
[TestFixture]
public class TestSceneChannelList : OsuTestScene
{
[Cached]
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
[Cached]
private readonly Bindable<Channel> selected = new Bindable<Channel>();
private OsuSpriteText selectorText;
private OsuSpriteText selectedText;
private OsuSpriteText leaveText;
private ChannelList channelList;
[SetUp]
public void SetUp()
{
Schedule(() =>
{
Child = new GridContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
Height = 0.7f,
RowDimensions = new[]
{
new Dimension(GridSizeMode.Absolute, 20),
new Dimension(GridSizeMode.Absolute, 20),
new Dimension(GridSizeMode.Absolute, 20),
new Dimension(),
},
Content = new[]
{
new Drawable[]
{
selectorText = new OsuSpriteText
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
},
},
new Drawable[]
{
selectedText = new OsuSpriteText
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
},
},
new Drawable[]
{
leaveText = new OsuSpriteText
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
},
},
new Drawable[]
{
channelList = new ChannelList
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
RelativeSizeAxes = Axes.Y,
Width = 190,
},
},
},
};
channelList.OnRequestSelect += channel =>
{
channelList.SelectorActive.Value = false;
selected.Value = channel;
};
channelList.OnRequestLeave += channel =>
{
leaveText.Text = $"OnRequestLeave: {channel.Name}";
leaveText.FadeOutFromOne(1000, Easing.InQuint);
selected.Value = null;
channelList.RemoveChannel(channel);
};
channelList.SelectorActive.BindValueChanged(change =>
{
selectorText.Text = $"Channel Selector Active: {change.NewValue}";
selected.Value = null;
}, true);
selected.BindValueChanged(change =>
{
selectedText.Text = $"Selected Channel: {change.NewValue?.Name ?? "[null]"}";
}, true);
});
}
[SetUpSteps]
public void SetUpSteps()
{
AddStep("Add Public Channels", () =>
{
for (int i = 0; i < 10; i++)
channelList.AddChannel(createRandomPublicChannel());
});
AddStep("Add Private Channels", () =>
{
for (int i = 0; i < 10; i++)
channelList.AddChannel(createRandomPrivateChannel());
});
}
[Test]
public void TestVisual()
{
AddStep("Unread Selected", () =>
{
if (selected.Value != null)
channelList.GetItem(selected.Value).Unread.Value = true;
});
AddStep("Read Selected", () =>
{
if (selected.Value != null)
channelList.GetItem(selected.Value).Unread.Value = false;
});
AddStep("Add Mention Selected", () =>
{
if (selected.Value != null)
channelList.GetItem(selected.Value).Mentions.Value++;
});
AddStep("Add 98 Mentions Selected", () =>
{
if (selected.Value != null)
channelList.GetItem(selected.Value).Mentions.Value += 98;
});
AddStep("Clear Mentions Selected", () =>
{
if (selected.Value != null)
channelList.GetItem(selected.Value).Mentions.Value = 0;
});
}
private Channel createRandomPublicChannel()
{
int id = RNG.Next(0, 10000);
return new Channel
{
Name = $"#channel-{id}",
Type = ChannelType.Public,
Id = id,
};
}
private Channel createRandomPrivateChannel()
{
int id = RNG.Next(0, 10000);
return new Channel(new APIUser
{
Id = id,
Username = $"test user {id}",
});
}
}
}

View File

@ -1,163 +0,0 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using NUnit.Framework;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Chat;
using osu.Game.Overlays;
using osu.Game.Overlays.Chat.ChannelList;
using osuTK;
namespace osu.Game.Tests.Visual.Online
{
[TestFixture]
public class TestSceneChannelListItem : OsuTestScene
{
[Cached]
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
[Cached]
private readonly Bindable<Channel> selected = new Bindable<Channel>();
private static readonly List<Channel> channels = new List<Channel>
{
createPublicChannel("#public-channel"),
createPublicChannel("#public-channel-long-name"),
createPrivateChannel("test user", 2),
createPrivateChannel("test user long name", 3),
};
private readonly Dictionary<Channel, ChannelListItem> channelMap = new Dictionary<Channel, ChannelListItem>();
private FillFlowContainer flow;
private OsuSpriteText selectedText;
private OsuSpriteText leaveText;
[SetUp]
public void SetUp()
{
Schedule(() =>
{
foreach (var item in channelMap.Values)
item.Expire();
channelMap.Clear();
Child = new FillFlowContainer
{
Direction = FillDirection.Vertical,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
AutoSizeAxes = Axes.Both,
Spacing = new Vector2(10),
Children = new Drawable[]
{
selectedText = new OsuSpriteText
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
},
leaveText = new OsuSpriteText
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Height = 16,
AlwaysPresent = true,
},
new Container
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
AutoSizeAxes = Axes.Y,
Width = 190,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Background6,
},
flow = new FillFlowContainer
{
Direction = FillDirection.Vertical,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
},
},
},
},
};
selected.BindValueChanged(change =>
{
selectedText.Text = $"Selected Channel: {change.NewValue?.Name ?? "[null]"}";
}, true);
foreach (var channel in channels)
{
var item = new ChannelListItem(channel);
flow.Add(item);
channelMap.Add(channel, item);
item.OnRequestSelect += c => selected.Value = c;
item.OnRequestLeave += leaveChannel;
}
});
}
[Test]
public void TestVisual()
{
AddStep("Select second item", () => selected.Value = channels.Skip(1).First());
AddStep("Unread Selected", () =>
{
if (selected.Value != null)
channelMap[selected.Value].Unread.Value = true;
});
AddStep("Read Selected", () =>
{
if (selected.Value != null)
channelMap[selected.Value].Unread.Value = false;
});
AddStep("Add Mention Selected", () =>
{
if (selected.Value != null)
channelMap[selected.Value].Mentions.Value++;
});
AddStep("Add 98 Mentions Selected", () =>
{
if (selected.Value != null)
channelMap[selected.Value].Mentions.Value += 98;
});
AddStep("Clear Mentions Selected", () =>
{
if (selected.Value != null)
channelMap[selected.Value].Mentions.Value = 0;
});
}
private void leaveChannel(Channel channel)
{
leaveText.Text = $"OnRequestLeave: {channel.Name}";
leaveText.FadeOutFromOne(1000, Easing.InQuint);
}
private static Channel createPublicChannel(string name) =>
new Channel { Name = name, Type = ChannelType.Public, Id = 1234 };
private static Channel createPrivateChannel(string username, int id)
=> new Channel(new APIUser { Id = id, Username = username });
}
}

View File

@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Overlays.Settings;
using osu.Game.Overlays.Settings.Sections; using osu.Game.Overlays.Settings.Sections;
using osu.Game.Overlays.Settings.Sections.Input; using osu.Game.Overlays.Settings.Sections.Input;
using osuTK.Input; using osuTK.Input;
@ -34,6 +35,29 @@ namespace osu.Game.Tests.Visual.Settings
}); });
} }
[Test]
public void TestQuickFiltering()
{
AddStep("set filter", () =>
{
settings.SectionsContainer.ChildrenOfType<SearchTextBox>().First().Current.Value = "scaling";
});
AddUntilStep("wait for items to load", () => settings.SectionsContainer.ChildrenOfType<IFilterable>().Any());
AddAssert("ensure all items match filter", () => settings.SectionsContainer
.ChildrenOfType<SettingsSection>().Where(f => f.IsPresent)
.All(section =>
section.Children.Where(f => f.IsPresent)
.OfType<ISettingsItem>()
.OfType<IFilterable>()
.Where(f => !(f is IHasFilterableChildren))
.All(f => f.FilterTerms.Any(t => t.Contains("scaling")))
));
AddAssert("ensure section is current", () => settings.CurrentSection.Value is GraphicsSection);
}
[Test] [Test]
public void ToggleVisibility() public void ToggleVisibility()
{ {

View File

@ -80,10 +80,10 @@ namespace osu.Game.Tests.Visual
public override bool OnBackButton() => (screenStack.CurrentScreen as OsuScreen)?.OnBackButton() ?? base.OnBackButton(); public override bool OnBackButton() => (screenStack.CurrentScreen as OsuScreen)?.OnBackButton() ?? base.OnBackButton();
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
if (screenStack.CurrentScreen == null) if (screenStack.CurrentScreen == null)
return base.OnExiting(next); return base.OnExiting(e);
screenStack.Exit(); screenStack.Exit();
return true; return true;

View File

@ -47,12 +47,22 @@ namespace osu.Game.Tests.Visual.UserInterface
{ {
IncompatibilityDisplayingModPanel panel = null; IncompatibilityDisplayingModPanel panel = null;
AddStep("create panel with DT", () => Child = panel = new IncompatibilityDisplayingModPanel(new OsuModDoubleTime()) AddStep("create panel with DT", () =>
{ {
Anchor = Anchor.Centre, Child = panel = new IncompatibilityDisplayingModPanel(new OsuModDoubleTime())
Origin = Anchor.Centre, {
RelativeSizeAxes = Axes.None, Anchor = Anchor.Centre,
Width = 300 Origin = Anchor.Centre,
RelativeSizeAxes = Axes.None,
Width = 300,
};
panel.Active.BindValueChanged(active =>
{
SelectedMods.Value = active.NewValue
? Array.Empty<Mod>()
: new[] { panel.Mod };
});
}); });
clickPanel(); clickPanel();
@ -63,11 +73,6 @@ namespace osu.Game.Tests.Visual.UserInterface
AddStep("set incompatible mod", () => SelectedMods.Value = new[] { new OsuModHalfTime() }); AddStep("set incompatible mod", () => SelectedMods.Value = new[] { new OsuModHalfTime() });
clickPanel();
AddAssert("panel not active", () => !panel.Active.Value);
AddStep("reset mods", () => SelectedMods.Value = Array.Empty<Mod>());
clickPanel(); clickPanel();
AddAssert("panel active", () => panel.Active.Value); AddAssert("panel active", () => panel.Active.Value);

View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System;
using System.Linq; using System.Linq;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
@ -89,6 +90,27 @@ namespace osu.Game.Tests.Visual.UserInterface
changeRuleset(3); changeRuleset(3);
} }
[Test]
public void TestIncompatibilityToggling()
{
createScreen();
changeRuleset(0);
AddStep("activate DT", () => getPanelForMod(typeof(OsuModDoubleTime)).TriggerClick());
AddAssert("DT active", () => SelectedMods.Value.Single().GetType() == typeof(OsuModDoubleTime));
AddStep("activate NC", () => getPanelForMod(typeof(OsuModNightcore)).TriggerClick());
AddAssert("only NC active", () => SelectedMods.Value.Single().GetType() == typeof(OsuModNightcore));
AddStep("activate HR", () => getPanelForMod(typeof(OsuModHardRock)).TriggerClick());
AddAssert("NC+HR active", () => SelectedMods.Value.Any(mod => mod.GetType() == typeof(OsuModNightcore))
&& SelectedMods.Value.Any(mod => mod.GetType() == typeof(OsuModHardRock)));
AddStep("activate MR", () => getPanelForMod(typeof(OsuModMirror)).TriggerClick());
AddAssert("NC+MR active", () => SelectedMods.Value.Any(mod => mod.GetType() == typeof(OsuModNightcore))
&& SelectedMods.Value.Any(mod => mod.GetType() == typeof(OsuModMirror)));
}
[Test] [Test]
public void TestCustomisationToggleState() public void TestCustomisationToggleState()
{ {
@ -136,5 +158,8 @@ namespace osu.Game.Tests.Visual.UserInterface
AddAssert($"customisation toggle is {(disabled ? "" : "not ")}disabled", () => getToggle().Active.Disabled == disabled); AddAssert($"customisation toggle is {(disabled ? "" : "not ")}disabled", () => getToggle().Active.Disabled == disabled);
AddAssert($"customisation toggle is {(active ? "" : "not ")}active", () => getToggle().Active.Value == active); AddAssert($"customisation toggle is {(active ? "" : "not ")}active", () => getToggle().Active.Value == active);
} }
private ModPanel getPanelForMod(Type modType)
=> modSelectScreen.ChildrenOfType<ModPanel>().Single(panel => panel.Mod.GetType() == modType);
} }
} }

View File

@ -7,7 +7,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osuTK; using osuTK;
@ -16,11 +15,11 @@ namespace osu.Game.Beatmaps.Drawables
{ {
internal class DifficultyIconTooltip : VisibilityContainer, ITooltip<DifficultyIconTooltipContent> internal class DifficultyIconTooltip : VisibilityContainer, ITooltip<DifficultyIconTooltipContent>
{ {
private readonly OsuSpriteText difficultyName, starRating; private OsuSpriteText difficultyName;
private readonly Box background; private StarRatingDisplay starRating;
private readonly FillFlowContainer difficultyFlow;
public DifficultyIconTooltip() [BackgroundDependencyLoader]
private void load(OsuColour colours)
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
Masking = true; Masking = true;
@ -28,9 +27,10 @@ namespace osu.Game.Beatmaps.Drawables
Children = new Drawable[] Children = new Drawable[]
{ {
background = new Box new Box
{ {
Alpha = 0.9f, Alpha = 0.9f,
Colour = colours.Gray3,
RelativeSizeAxes = Axes.Both RelativeSizeAxes = Axes.Both
}, },
new FillFlowContainer new FillFlowContainer
@ -40,6 +40,7 @@ namespace osu.Game.Beatmaps.Drawables
AutoSizeEasing = Easing.OutQuint, AutoSizeEasing = Easing.OutQuint,
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
Padding = new MarginPadding(10), Padding = new MarginPadding(10),
Spacing = new Vector2(5),
Children = new Drawable[] Children = new Drawable[]
{ {
difficultyName = new OsuSpriteText difficultyName = new OsuSpriteText
@ -48,57 +49,27 @@ namespace osu.Game.Beatmaps.Drawables
Origin = Anchor.Centre, Origin = Anchor.Centre,
Font = OsuFont.GetFont(size: 16, weight: FontWeight.Bold), Font = OsuFont.GetFont(size: 16, weight: FontWeight.Bold),
}, },
difficultyFlow = new FillFlowContainer starRating = new StarRatingDisplay(default, StarRatingDisplaySize.Small)
{ {
AutoSizeAxes = Axes.Both,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Direction = FillDirection.Horizontal,
Children = new Drawable[]
{
starRating = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular),
},
new SpriteIcon
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Margin = new MarginPadding { Left = 4 },
Icon = FontAwesome.Solid.Star,
Size = new Vector2(12),
},
}
} }
} }
} }
}; };
} }
[Resolved] private DifficultyIconTooltipContent displayedContent;
private OsuColour colours { get; set; }
[BackgroundDependencyLoader]
private void load()
{
background.Colour = colours.Gray3;
}
private readonly IBindable<StarDifficulty> starDifficulty = new Bindable<StarDifficulty>();
public void SetContent(DifficultyIconTooltipContent content) public void SetContent(DifficultyIconTooltipContent content)
{ {
difficultyName.Text = content.BeatmapInfo.DifficultyName; if (displayedContent != null)
starRating.Current.UnbindFrom(displayedContent.Difficulty);
starDifficulty.UnbindAll(); displayedContent = content;
starDifficulty.BindTo(content.Difficulty);
starDifficulty.BindValueChanged(difficulty => starRating.Current.BindTarget = displayedContent.Difficulty;
{ difficultyName.Text = displayedContent.BeatmapInfo.DifficultyName;
starRating.Text = $"{difficulty.NewValue.Stars:0.##}";
difficultyFlow.Colour = colours.ForStarDifficulty(difficulty.NewValue.Stars);
}, true);
} }
public void Move(Vector2 pos) => Position = pos; public void Move(Vector2 pos) => Position = pos;

View File

@ -209,7 +209,7 @@ namespace osu.Game.Graphics.Containers
{ {
protected override bool AllowStoryboardBackground => false; protected override bool AllowStoryboardBackground => false;
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
this.FadeInFromZero(4000, Easing.OutQuint); this.FadeInFromZero(4000, Easing.OutQuint);
} }

View File

@ -22,17 +22,17 @@ namespace osu.Game.Localisation
/// <summary> /// <summary>
/// "First-run setup" /// "First-run setup"
/// </summary> /// </summary>
public static LocalisableString FirstRunSetup => new TranslatableString(getKey(@"first_run_setup"), @"First-run setup"); public static LocalisableString FirstRunSetupTitle => new TranslatableString(getKey(@"first_run_setup_title"), @"First-run setup");
/// <summary> /// <summary>
/// "Setup osu! to suit you" /// "Set up osu! to suit you"
/// </summary> /// </summary>
public static LocalisableString SetupOsuToSuitYou => new TranslatableString(getKey(@"setup_osu_to_suit_you"), @"Setup osu! to suit you"); public static LocalisableString FirstRunSetupDescription => new TranslatableString(getKey(@"first_run_setup_description"), @"Set up osu! to suit you");
/// <summary> /// <summary>
/// "Welcome" /// "Welcome"
/// </summary> /// </summary>
public static LocalisableString Welcome => new TranslatableString(getKey(@"welcome"), @"Welcome"); public static LocalisableString WelcomeTitle => new TranslatableString(getKey(@"welcome_title"), @"Welcome");
/// <summary> /// <summary>
/// "Welcome to the first-run setup guide! /// "Welcome to the first-run setup guide!
@ -44,9 +44,9 @@ namespace osu.Game.Localisation
osu! is a very configurable game, and diving straight into the settings can sometimes be overwhelming. This guide will help you get the important choices out of the way to ensure a great first experience!"); osu! is a very configurable game, and diving straight into the settings can sometimes be overwhelming. This guide will help you get the important choices out of the way to ensure a great first experience!");
/// <summary> /// <summary>
/// "The size of the osu! user interface size can be adjusted to your liking." /// "The size of the osu! user interface can be adjusted to your liking."
/// </summary> /// </summary>
public static LocalisableString UIScaleDescription => new TranslatableString(getKey(@"ui_scale_description"), @"The size of the osu! user interface size can be adjusted to your liking."); public static LocalisableString UIScaleDescription => new TranslatableString(getKey(@"ui_scale_description"), @"The size of the osu! user interface can be adjusted to your liking.");
/// <summary> /// <summary>
/// "Next ({0})" /// "Next ({0})"

View File

@ -29,6 +29,7 @@ namespace osu.Game.Online.API.Requests
Ranked, Ranked,
Loved, Loved,
Pending, Pending,
Guest,
Graveyard Graveyard
} }
} }

View File

@ -148,6 +148,9 @@ namespace osu.Game.Online.API.Requests.Responses
[JsonProperty(@"pending_beatmapset_count")] [JsonProperty(@"pending_beatmapset_count")]
public int PendingBeatmapsetCount; public int PendingBeatmapsetCount;
[JsonProperty(@"guest_beatmapset_count")]
public int GuestBeatmapsetCount;
[JsonProperty(@"scores_best_count")] [JsonProperty(@"scores_best_count")]
public int ScoresBestCount; public int ScoresBestCount;

View File

@ -5,6 +5,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.SignalR.Client; using Microsoft.AspNetCore.SignalR.Client;
@ -144,6 +145,12 @@ namespace osu.Game.Online
var builder = new HubConnectionBuilder() var builder = new HubConnectionBuilder()
.WithUrl(endpoint, options => .WithUrl(endpoint, options =>
{ {
// Use HttpClient.DefaultProxy once on net6 everywhere.
// The credential setter can also be removed at this point.
options.Proxy = WebRequest.DefaultWebProxy;
if (options.Proxy != null)
options.Proxy.Credentials = CredentialCache.DefaultCredentials;
options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
options.Headers.Add("OsuVersionHash", versionHash); options.Headers.Add("OsuVersionHash", versionHash);
}); });

View File

@ -8,21 +8,21 @@ namespace osu.Game.Overlays.AccountCreation
{ {
public abstract class AccountCreationScreen : Screen public abstract class AccountCreationScreen : Screen
{ {
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
this.FadeOut().Delay(200).FadeIn(200); this.FadeOut().Delay(200).FadeIn(200);
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
this.FadeIn(200); this.FadeIn(200);
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
base.OnSuspending(next); base.OnSuspending(e);
this.FadeOut(200); this.FadeOut(200);
} }
} }

View File

@ -147,9 +147,9 @@ namespace osu.Game.Overlays.AccountCreation
d.Colour = password.Length == 0 ? Color4.White : Interpolation.ValueAt(password.Length, Color4.OrangeRed, Color4.YellowGreen, 0, 8, Easing.In); d.Colour = password.Length == 0 ? Color4.White : Interpolation.ValueAt(password.Length, Color4.OrangeRed, Color4.YellowGreen, 0, 8, Easing.In);
} }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
loadingLayer.Hide(); loadingLayer.Hide();
if (host?.OnScreenKeyboardOverlapsGameWindow != true) if (host?.OnScreenKeyboardOverlapsGameWindow != true)

View File

@ -31,7 +31,7 @@ namespace osu.Game.Overlays.AccountCreation
private const string help_centre_url = "/help/wiki/Help_Centre#login"; private const string help_centre_url = "/help/wiki/Help_Centre#login";
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
if (string.IsNullOrEmpty(api?.ProvidedUsername) || game?.UseDevelopmentServer == true) if (string.IsNullOrEmpty(api?.ProvidedUsername) || game?.UseDevelopmentServer == true)
{ {
@ -40,7 +40,7 @@ namespace osu.Game.Overlays.AccountCreation
return; return;
} }
base.OnEntering(last); base.OnEntering(e);
} }
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]

View File

@ -0,0 +1,135 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
#nullable enable
using System;
using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
namespace osu.Game.Overlays.Chat.ChannelList
{
public class ChannelList : Container
{
public Action<Channel>? OnRequestSelect;
public Action<Channel>? OnRequestLeave;
public readonly BindableBool SelectorActive = new BindableBool();
private readonly Dictionary<Channel, ChannelListItem> channelMap = new Dictionary<Channel, ChannelListItem>();
private ChannelListItemFlow publicChannelFlow = null!;
private ChannelListItemFlow privateChannelFlow = null!;
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
{
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Background6,
},
new OsuScrollContainer
{
Padding = new MarginPadding { Vertical = 7 },
RelativeSizeAxes = Axes.Both,
ScrollbarAnchor = Anchor.TopRight,
ScrollDistance = 35f,
Child = new FillFlowContainer
{
Direction = FillDirection.Vertical,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Children = new Drawable[]
{
publicChannelFlow = new ChannelListItemFlow("CHANNELS"),
new ChannelListSelector
{
Margin = new MarginPadding { Bottom = 10 },
SelectorActive = { BindTarget = SelectorActive },
},
privateChannelFlow = new ChannelListItemFlow("DIRECT MESSAGES"),
},
},
},
};
}
public void AddChannel(Channel channel)
{
if (channelMap.ContainsKey(channel))
return;
ChannelListItem item = new ChannelListItem(channel);
item.OnRequestSelect += chan => OnRequestSelect?.Invoke(chan);
item.OnRequestLeave += chan => OnRequestLeave?.Invoke(chan);
item.SelectorActive.BindTarget = SelectorActive;
ChannelListItemFlow flow = getFlowForChannel(channel);
channelMap.Add(channel, item);
flow.Add(item);
}
public void RemoveChannel(Channel channel)
{
if (!channelMap.ContainsKey(channel))
return;
ChannelListItem item = channelMap[channel];
ChannelListItemFlow flow = getFlowForChannel(channel);
channelMap.Remove(channel);
flow.Remove(item);
}
public ChannelListItem GetItem(Channel channel)
{
if (!channelMap.ContainsKey(channel))
throw new ArgumentOutOfRangeException();
return channelMap[channel];
}
private ChannelListItemFlow getFlowForChannel(Channel channel)
{
switch (channel.Type)
{
case ChannelType.Public:
return publicChannelFlow;
case ChannelType.PM:
return privateChannelFlow;
default:
throw new ArgumentOutOfRangeException();
}
}
private class ChannelListItemFlow : FillFlowContainer
{
public ChannelListItemFlow(string label)
{
Direction = FillDirection.Vertical;
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
Add(new OsuSpriteText
{
Text = label,
Margin = new MarginPadding { Left = 18, Bottom = 5 },
Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
});
}
}
}
}

View File

@ -29,12 +29,14 @@ namespace osu.Game.Overlays.Chat.ChannelList
public readonly BindableBool Unread = new BindableBool(); public readonly BindableBool Unread = new BindableBool();
public readonly BindableBool SelectorActive = new BindableBool();
private readonly Channel channel; private readonly Channel channel;
private Box? hoverBox; private Box hoverBox = null!;
private Box? selectBox; private Box selectBox = null!;
private OsuSpriteText? text; private OsuSpriteText text = null!;
private ChannelListItemCloseButton? close; private ChannelListItemCloseButton close = null!;
[Resolved] [Resolved]
private Bindable<Channel> selectedChannel { get; set; } = null!; private Bindable<Channel> selectedChannel { get; set; } = null!;
@ -124,31 +126,26 @@ namespace osu.Game.Overlays.Chat.ChannelList
{ {
base.LoadComplete(); base.LoadComplete();
selectedChannel.BindValueChanged(change => selectedChannel.BindValueChanged(_ => updateSelectState(), true);
{ SelectorActive.BindValueChanged(_ => updateSelectState(), true);
if (change.NewValue == channel)
selectBox?.FadeIn(300, Easing.OutQuint);
else
selectBox?.FadeOut(200, Easing.OutQuint);
}, true);
Unread.BindValueChanged(change => Unread.BindValueChanged(change =>
{ {
text!.FadeColour(change.NewValue ? colourProvider.Content1 : colourProvider.Light3, 300, Easing.OutQuint); text.FadeColour(change.NewValue ? colourProvider.Content1 : colourProvider.Light3, 300, Easing.OutQuint);
}, true); }, true);
} }
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
hoverBox?.FadeIn(300, Easing.OutQuint); hoverBox.FadeIn(300, Easing.OutQuint);
close?.FadeIn(300, Easing.OutQuint); close.FadeIn(300, Easing.OutQuint);
return base.OnHover(e); return base.OnHover(e);
} }
protected override void OnHoverLost(HoverLostEvent e) protected override void OnHoverLost(HoverLostEvent e)
{ {
hoverBox?.FadeOut(200, Easing.OutQuint); hoverBox.FadeOut(200, Easing.OutQuint);
close?.FadeOut(200, Easing.OutQuint); close.FadeOut(200, Easing.OutQuint);
base.OnHoverLost(e); base.OnHoverLost(e);
} }
@ -167,5 +164,13 @@ namespace osu.Game.Overlays.Chat.ChannelList
Masking = true, Masking = true,
}; };
} }
private void updateSelectState()
{
if (selectedChannel.Value == channel && !SelectorActive.Value)
selectBox.FadeIn(300, Easing.OutQuint);
else
selectBox.FadeOut(200, Easing.OutQuint);
}
} }
} }

View File

@ -0,0 +1,91 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
#nullable enable
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
namespace osu.Game.Overlays.Chat.ChannelList
{
public class ChannelListSelector : OsuClickableContainer
{
public readonly BindableBool SelectorActive = new BindableBool();
private Box hoverBox = null!;
private Box selectBox = null!;
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
{
Height = 30;
RelativeSizeAxes = Axes.X;
Children = new Drawable[]
{
hoverBox = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Background3,
Alpha = 0f,
},
selectBox = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Background4,
Alpha = 0f,
},
new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Left = 18, Right = 10 },
Child = new OsuSpriteText
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Text = "Add More Channels",
Font = OsuFont.Torus.With(size: 17, weight: FontWeight.SemiBold),
Colour = colourProvider.Light3,
Margin = new MarginPadding { Bottom = 2 },
RelativeSizeAxes = Axes.X,
Truncate = true,
},
},
};
}
protected override void LoadComplete()
{
base.LoadComplete();
SelectorActive.BindValueChanged(selector =>
{
if (selector.NewValue)
selectBox.FadeIn(300, Easing.OutQuint);
else
selectBox.FadeOut(200, Easing.OutQuint);
}, true);
Action = () => SelectorActive.Value = true;
}
protected override bool OnHover(HoverEvent e)
{
hoverBox.FadeIn(300, Easing.OutQuint);
return base.OnHover(e);
}
protected override void OnHoverLost(HoverLostEvent e)
{
hoverBox.FadeOut(200, Easing.OutQuint);
base.OnHoverLost(e);
}
}
}

View File

@ -33,39 +33,39 @@ namespace osu.Game.Overlays.FirstRunSetup
}; };
} }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
this this
.FadeInFromZero(500) .FadeInFromZero(500)
.MoveToX(offset) .MoveToX(offset)
.MoveToX(0, 500, Easing.OutQuint); .MoveToX(0, 500, Easing.OutQuint);
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
this this
.FadeInFromZero(500) .FadeInFromZero(500)
.MoveToX(0, 500, Easing.OutQuint); .MoveToX(0, 500, Easing.OutQuint);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
this this
.FadeOut(100) .FadeOut(100)
.MoveToX(offset, 500, Easing.OutQuint); .MoveToX(offset, 500, Easing.OutQuint);
return base.OnExiting(next); return base.OnExiting(e);
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
this this
.FadeOut(100) .FadeOut(100)
.MoveToX(-offset, 500, Easing.OutQuint); .MoveToX(-offset, 500, Easing.OutQuint);
base.OnSuspending(next); base.OnSuspending(e);
} }
} }
} }

View File

@ -97,9 +97,9 @@ namespace osu.Game.Overlays.FirstRunSetup
private class PinnedMainMenu : MainMenu private class PinnedMainMenu : MainMenu
{ {
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
Buttons.ReturnToTopOnIdle = false; Buttons.ReturnToTopOnIdle = false;
Buttons.State = ButtonSystemState.TopLevel; Buttons.State = ButtonSystemState.TopLevel;

View File

@ -58,7 +58,7 @@ namespace osu.Game.Overlays
private readonly FirstRunStep[] steps = private readonly FirstRunStep[] steps =
{ {
new FirstRunStep(typeof(ScreenWelcome), FirstRunSetupOverlayStrings.Welcome), new FirstRunStep(typeof(ScreenWelcome), FirstRunSetupOverlayStrings.WelcomeTitle),
new FirstRunStep(typeof(ScreenUIScale), GraphicsSettingsStrings.UIScaling), new FirstRunStep(typeof(ScreenUIScale), GraphicsSettingsStrings.UIScaling),
}; };
@ -71,8 +71,8 @@ namespace osu.Game.Overlays
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
Header.Title = FirstRunSetupOverlayStrings.FirstRunSetup; Header.Title = FirstRunSetupOverlayStrings.FirstRunSetupTitle;
Header.Description = FirstRunSetupOverlayStrings.SetupOsuToSuitYou; Header.Description = FirstRunSetupOverlayStrings.FirstRunSetupDescription;
MainAreaContent.AddRange(new Drawable[] MainAreaContent.AddRange(new Drawable[]
{ {

View File

@ -52,7 +52,7 @@ namespace osu.Game.Overlays.Mods
Height = HEIGHT; Height = HEIGHT;
AutoSizeAxes = Axes.X; AutoSizeAxes = Axes.X;
InternalChild = new Container InternalChild = new InputBlockingContainer
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, AutoSizeAxes = Axes.X,

View File

@ -1,15 +1,12 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Input.Events;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Utils; using osu.Game.Utils;
@ -42,41 +39,13 @@ namespace osu.Game.Overlays.Mods
&& !ModUtils.CheckCompatibleSet(selectedMods.Value.Append(Mod)); && !ModUtils.CheckCompatibleSet(selectedMods.Value.Append(Mod));
} }
protected override Colour4 BackgroundColour => incompatible.Value ? (Colour4)ColourProvider.Background6 : base.BackgroundColour;
protected override Colour4 ForegroundColour => incompatible.Value ? (Colour4)ColourProvider.Background5 : base.ForegroundColour;
protected override void UpdateState() protected override void UpdateState()
{ {
Action = incompatible.Value ? () => { } : (Action)Active.Toggle;
if (incompatible.Value)
{
Colour4 backgroundColour = ColourProvider.Background6;
Colour4 textBackgroundColour = ColourProvider.Background5;
Content.TransformTo(nameof(BorderColour), ColourInfo.GradientVertical(backgroundColour, textBackgroundColour), TRANSITION_DURATION, Easing.OutQuint);
Background.FadeColour(backgroundColour, TRANSITION_DURATION, Easing.OutQuint);
SwitchContainer.ResizeWidthTo(IDLE_SWITCH_WIDTH, TRANSITION_DURATION, Easing.OutQuint);
SwitchContainer.FadeColour(Colour4.Gray, TRANSITION_DURATION, Easing.OutQuint);
MainContentContainer.TransformTo(nameof(Padding), new MarginPadding
{
Left = IDLE_SWITCH_WIDTH,
Right = CORNER_RADIUS
}, TRANSITION_DURATION, Easing.OutQuint);
TextBackground.FadeColour(textBackgroundColour, TRANSITION_DURATION, Easing.OutQuint);
TextFlow.FadeColour(Colour4.White.Opacity(0.5f), TRANSITION_DURATION, Easing.OutQuint);
return;
}
SwitchContainer.FadeColour(Colour4.White, TRANSITION_DURATION, Easing.OutQuint);
base.UpdateState(); base.UpdateState();
} SwitchContainer.FadeColour(incompatible.Value ? Colour4.Gray : Colour4.White, TRANSITION_DURATION, Easing.OutQuint);
protected override bool OnMouseDown(MouseDownEvent e)
{
if (incompatible.Value)
return true; // bypasses base call purposely in order to not play out the intermediate state animation.
return base.OnMouseDown(e);
} }
#region IHasCustomTooltip #region IHasCustomTooltip

View File

@ -203,20 +203,24 @@ namespace osu.Game.Overlays.Mods
base.OnMouseUp(e); base.OnMouseUp(e);
} }
protected virtual Colour4 BackgroundColour => Active.Value ? activeColour.Darken(0.3f) : (Colour4)ColourProvider.Background3;
protected virtual Colour4 ForegroundColour => Active.Value ? activeColour : (Colour4)ColourProvider.Background2;
protected virtual Colour4 TextColour => Active.Value ? (Colour4)ColourProvider.Background6 : Colour4.White;
protected virtual void UpdateState() protected virtual void UpdateState()
{ {
float targetWidth = Active.Value ? EXPANDED_SWITCH_WIDTH : IDLE_SWITCH_WIDTH; float targetWidth = Active.Value ? EXPANDED_SWITCH_WIDTH : IDLE_SWITCH_WIDTH;
double transitionDuration = TRANSITION_DURATION; double transitionDuration = TRANSITION_DURATION;
Colour4 textBackgroundColour = Active.Value ? activeColour : (Colour4)ColourProvider.Background2; Colour4 backgroundColour = BackgroundColour;
Colour4 mainBackgroundColour = Active.Value ? activeColour.Darken(0.3f) : (Colour4)ColourProvider.Background3; Colour4 foregroundColour = ForegroundColour;
Colour4 textColour = Active.Value ? (Colour4)ColourProvider.Background6 : Colour4.White; Colour4 textColour = TextColour;
// Hover affects colour of button background // Hover affects colour of button background
if (IsHovered) if (IsHovered)
{ {
textBackgroundColour = textBackgroundColour.Lighten(0.1f); backgroundColour = backgroundColour.Lighten(0.1f);
mainBackgroundColour = mainBackgroundColour.Lighten(0.1f); foregroundColour = foregroundColour.Lighten(0.1f);
} }
// Mouse down adds a halfway tween of the movement // Mouse down adds a halfway tween of the movement
@ -226,15 +230,15 @@ namespace osu.Game.Overlays.Mods
transitionDuration *= 4; transitionDuration *= 4;
} }
Content.TransformTo(nameof(BorderColour), ColourInfo.GradientVertical(mainBackgroundColour, textBackgroundColour), transitionDuration, Easing.OutQuint); Content.TransformTo(nameof(BorderColour), ColourInfo.GradientVertical(backgroundColour, foregroundColour), transitionDuration, Easing.OutQuint);
Background.FadeColour(mainBackgroundColour, transitionDuration, Easing.OutQuint); Background.FadeColour(backgroundColour, transitionDuration, Easing.OutQuint);
SwitchContainer.ResizeWidthTo(targetWidth, transitionDuration, Easing.OutQuint); SwitchContainer.ResizeWidthTo(targetWidth, transitionDuration, Easing.OutQuint);
MainContentContainer.TransformTo(nameof(Padding), new MarginPadding MainContentContainer.TransformTo(nameof(Padding), new MarginPadding
{ {
Left = targetWidth, Left = targetWidth,
Right = CORNER_RADIUS Right = CORNER_RADIUS
}, transitionDuration, Easing.OutQuint); }, transitionDuration, Easing.OutQuint);
TextBackground.FadeColour(textBackgroundColour, transitionDuration, Easing.OutQuint); TextBackground.FadeColour(foregroundColour, transitionDuration, Easing.OutQuint);
TextFlow.FadeColour(textColour, transitionDuration, Easing.OutQuint); TextFlow.FadeColour(textColour, transitionDuration, Easing.OutQuint);
} }

View File

@ -168,7 +168,7 @@ namespace osu.Game.Overlays.Mods
foreach (var column in columnFlow) foreach (var column in columnFlow)
{ {
column.SelectedMods.BindValueChanged(_ => updateBindableFromSelection()); column.SelectedMods.BindValueChanged(updateBindableFromSelection);
} }
customisationVisible.BindValueChanged(_ => updateCustomisationVisualState(), true); customisationVisible.BindValueChanged(_ => updateCustomisationVisualState(), true);
@ -237,33 +237,36 @@ namespace osu.Game.Overlays.Mods
TopLevelContent.MoveToY(-modAreaHeight, transition_duration, Easing.InOutCubic); TopLevelContent.MoveToY(-modAreaHeight, transition_duration, Easing.InOutCubic);
} }
private bool selectionBindableSyncInProgress;
private void updateSelectionFromBindable() private void updateSelectionFromBindable()
{ {
if (selectionBindableSyncInProgress) // note that selectionBindableSyncInProgress is purposefully not checked here.
return; // this is because in the case of mod selection in solo gameplay, a user selection of a mod can actually lead to deselection of other incompatible mods.
// to synchronise state correctly, updateBindableFromSelection() computes the final mods (including incompatibility rules) and updates SelectedMods,
selectionBindableSyncInProgress = true; // and this method then runs unconditionally again to make sure the new visual selection accurately reflects the final set of selected mods.
// selectionBindableSyncInProgress ensures that mutual infinite recursion does not happen after that unconditional call.
foreach (var column in columnFlow) foreach (var column in columnFlow)
column.SelectedMods.Value = SelectedMods.Value.Where(mod => mod.Type == column.ModType).ToArray(); column.SelectedMods.Value = SelectedMods.Value.Where(mod => mod.Type == column.ModType).ToArray();
selectionBindableSyncInProgress = false;
} }
private void updateBindableFromSelection() private bool selectionBindableSyncInProgress;
private void updateBindableFromSelection(ValueChangedEvent<IReadOnlyList<Mod>> modSelectionChange)
{ {
if (selectionBindableSyncInProgress) if (selectionBindableSyncInProgress)
return; return;
selectionBindableSyncInProgress = true; selectionBindableSyncInProgress = true;
SelectedMods.Value = columnFlow.SelectMany(column => column.SelectedMods.Value).ToArray(); SelectedMods.Value = ComputeNewModsFromSelection(
modSelectionChange.NewValue.Except(modSelectionChange.OldValue),
modSelectionChange.OldValue.Except(modSelectionChange.NewValue));
selectionBindableSyncInProgress = false; selectionBindableSyncInProgress = false;
} }
protected virtual IReadOnlyList<Mod> ComputeNewModsFromSelection(IEnumerable<Mod> addedMods, IEnumerable<Mod> removedMods)
=> columnFlow.SelectMany(column => column.SelectedMods.Value).ToArray();
protected override void PopIn() protected override void PopIn()
{ {
const double fade_in_duration = 400; const double fade_in_duration = 400;

View File

@ -1,8 +1,11 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Utils;
using osuTK.Input; using osuTK.Input;
namespace osu.Game.Overlays.Mods namespace osu.Game.Overlays.Mods
@ -11,6 +14,24 @@ namespace osu.Game.Overlays.Mods
{ {
protected override ModColumn CreateModColumn(ModType modType, Key[] toggleKeys = null) => new UserModColumn(modType, false, toggleKeys); protected override ModColumn CreateModColumn(ModType modType, Key[] toggleKeys = null) => new UserModColumn(modType, false, toggleKeys);
protected override IReadOnlyList<Mod> ComputeNewModsFromSelection(IEnumerable<Mod> addedMods, IEnumerable<Mod> removedMods)
{
IEnumerable<Mod> modsAfterRemoval = SelectedMods.Value.Except(removedMods).ToList();
// the preference is that all new mods should override potential incompatible old mods.
// in general that's a bit difficult to compute if more than one mod is added at a time,
// so be conservative and just remove all mods that aren't compatible with any one added mod.
foreach (var addedMod in addedMods)
{
if (!ModUtils.CheckCompatibleSet(modsAfterRemoval.Append(addedMod), out var invalidMods))
modsAfterRemoval = modsAfterRemoval.Except(invalidMods);
modsAfterRemoval = modsAfterRemoval.Append(addedMod).ToList();
}
return modsAfterRemoval.ToList();
}
private class UserModColumn : ModColumn private class UserModColumn : ModColumn
{ {
public UserModColumn(ModType modType, bool allowBulkSelection, [CanBeNull] Key[] toggleKeys = null) public UserModColumn(ModType modType, bool allowBulkSelection, [CanBeNull] Key[] toggleKeys = null)

View File

@ -53,6 +53,9 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
case BeatmapSetType.Pending: case BeatmapSetType.Pending:
return user.PendingBeatmapsetCount; return user.PendingBeatmapsetCount;
case BeatmapSetType.Guest:
return user.GuestBeatmapsetCount;
default: default:
return 0; return 0;
} }

View File

@ -21,6 +21,7 @@ namespace osu.Game.Overlays.Profile.Sections
new PaginatedBeatmapContainer(BeatmapSetType.Favourite, User, UsersStrings.ShowExtraBeatmapsFavouriteTitle), new PaginatedBeatmapContainer(BeatmapSetType.Favourite, User, UsersStrings.ShowExtraBeatmapsFavouriteTitle),
new PaginatedBeatmapContainer(BeatmapSetType.Ranked, User, UsersStrings.ShowExtraBeatmapsRankedTitle), new PaginatedBeatmapContainer(BeatmapSetType.Ranked, User, UsersStrings.ShowExtraBeatmapsRankedTitle),
new PaginatedBeatmapContainer(BeatmapSetType.Loved, User, UsersStrings.ShowExtraBeatmapsLovedTitle), new PaginatedBeatmapContainer(BeatmapSetType.Loved, User, UsersStrings.ShowExtraBeatmapsLovedTitle),
new PaginatedBeatmapContainer(BeatmapSetType.Guest, User, UsersStrings.ShowExtraBeatmapsGuestTitle),
new PaginatedBeatmapContainer(BeatmapSetType.Pending, User, UsersStrings.ShowExtraBeatmapsPendingTitle), new PaginatedBeatmapContainer(BeatmapSetType.Pending, User, UsersStrings.ShowExtraBeatmapsPendingTitle),
new PaginatedBeatmapContainer(BeatmapSetType.Graveyard, User, UsersStrings.ShowExtraBeatmapsGraveyardTitle) new PaginatedBeatmapContainer(BeatmapSetType.Graveyard, User, UsersStrings.ShowExtraBeatmapsGraveyardTitle)
}; };

View File

@ -124,9 +124,9 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
base.LoadComplete(); base.LoadComplete();
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
base.OnSuspending(next); base.OnSuspending(e);
this.FadeOut(250); this.FadeOut(250);
} }

View File

@ -124,20 +124,20 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
protected virtual bool PerformMigration() => game?.Migrate(destination.FullName) != false; protected virtual bool PerformMigration() => game?.Migrate(destination.FullName) != false;
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
this.FadeOut().Delay(250).Then().FadeIn(250); this.FadeOut().Delay(250).Then().FadeIn(250);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
// block until migration is finished // block until migration is finished
if (migrationTask?.IsCompleted == false) if (migrationTask?.IsCompleted == false)
return true; return true;
return base.OnExiting(next); return base.OnExiting(e);
} }
} }
} }

View File

@ -30,10 +30,10 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
this.Exit(); this.Exit();
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
taskCompletionSource.TrySetCanceled(); taskCompletionSource.TrySetCanceled();
return base.OnExiting(next); return base.OnExiting(e);
} }
} }
} }

View File

@ -100,10 +100,9 @@ namespace osu.Game.Overlays.Settings
public IEnumerable<string> Keywords { get; set; } public IEnumerable<string> Keywords { get; set; }
public bool MatchingFilter public override bool IsPresent => base.IsPresent && MatchingFilter;
{
set => Alpha = value ? 1 : 0; public bool MatchingFilter { get; set; } = true;
}
public bool FilteringActive { get; set; } public bool FilteringActive { get; set; }

View File

@ -21,6 +21,8 @@ namespace osu.Game.Overlays.Settings
protected FillFlowContainer FlowContent; protected FillFlowContainer FlowContent;
protected override Container<Drawable> Content => FlowContent; protected override Container<Drawable> Content => FlowContent;
public override bool IsPresent => base.IsPresent && MatchingFilter;
private IBindable<SettingsSection> selectedSection; private IBindable<SettingsSection> selectedSection;
private Box dim; private Box dim;
@ -38,10 +40,7 @@ namespace osu.Game.Overlays.Settings
private const int header_size = 24; private const int header_size = 24;
private const int border_size = 4; private const int border_size = 4;
public bool MatchingFilter public bool MatchingFilter { get; set; } = true;
{
set => this.FadeTo(value ? 1 : 0);
}
public bool FilteringActive { get; set; } public bool FilteringActive { get; set; }

View File

@ -163,6 +163,7 @@ namespace osu.Game.Overlays
Sidebar?.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint); Sidebar?.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint);
this.FadeTo(1, TRANSITION_LENGTH, Easing.OutQuint); this.FadeTo(1, TRANSITION_LENGTH, Easing.OutQuint);
searchTextBox.TakeFocus();
searchTextBox.HoldFocus = true; searchTextBox.HoldFocus = true;
} }
@ -213,7 +214,6 @@ namespace osu.Game.Overlays
loading.Hide(); loading.Hide();
searchTextBox.Current.BindValueChanged(term => SectionsContainer.SearchTerm = term.NewValue, true); searchTextBox.Current.BindValueChanged(term => SectionsContainer.SearchTerm = term.NewValue, true);
searchTextBox.TakeFocus();
loadSidebarButtons(); loadSidebarButtons();
}); });
@ -284,11 +284,7 @@ namespace osu.Game.Overlays
public string SearchTerm public string SearchTerm
{ {
get => SearchContainer.SearchTerm; get => SearchContainer.SearchTerm;
set set => SearchContainer.SearchTerm = value;
{
SearchContainer.SearchTerm = value;
InvalidateScrollPosition();
}
} }
protected override FlowContainer<SettingsSection> CreateScrollContentContainer() protected override FlowContainer<SettingsSection> CreateScrollContentContainer()
@ -307,6 +303,8 @@ namespace osu.Game.Overlays
Colour = colourProvider.Background4, Colour = colourProvider.Background4,
RelativeSizeAxes = Axes.Both RelativeSizeAxes = Axes.Both
}; };
SearchContainer.FilterCompleted += InvalidateScrollPosition;
} }
protected override void UpdateAfterChildren() protected override void UpdateAfterChildren()

View File

@ -48,7 +48,7 @@ namespace osu.Game.Screens
Scale = new Vector2(1 + x_movement_amount / DrawSize.X * 2); Scale = new Vector2(1 + x_movement_amount / DrawSize.X * 2);
} }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
if (animateOnEnter) if (animateOnEnter)
{ {
@ -59,16 +59,16 @@ namespace osu.Game.Screens
this.MoveToX(0, TRANSITION_LENGTH, Easing.InOutQuart); this.MoveToX(0, TRANSITION_LENGTH, Easing.InOutQuart);
} }
base.OnEntering(last); base.OnEntering(e);
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
this.MoveToX(-x_movement_amount, TRANSITION_LENGTH, Easing.InOutQuart); this.MoveToX(-x_movement_amount, TRANSITION_LENGTH, Easing.InOutQuart);
base.OnSuspending(next); base.OnSuspending(e);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
if (IsLoaded) if (IsLoaded)
{ {
@ -76,14 +76,14 @@ namespace osu.Game.Screens
this.MoveToX(x_movement_amount, TRANSITION_LENGTH, Easing.OutExpo); this.MoveToX(x_movement_amount, TRANSITION_LENGTH, Easing.OutExpo);
} }
return base.OnExiting(next); return base.OnExiting(e);
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
if (IsLoaded) if (IsLoaded)
this.MoveToX(0, TRANSITION_LENGTH, Easing.OutExpo); this.MoveToX(0, TRANSITION_LENGTH, Easing.OutExpo);
base.OnResuming(last); base.OnResuming(e);
} }
} }
} }

View File

@ -19,7 +19,7 @@ namespace osu.Game.Screens.Backgrounds
}; };
} }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
Show(); Show();
} }

View File

@ -560,16 +560,16 @@ namespace osu.Game.Screens.Edit
{ {
} }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
dimBackground(); dimBackground();
resetTrack(true); resetTrack(true);
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
dimBackground(); dimBackground();
} }
@ -585,7 +585,7 @@ namespace osu.Game.Screens.Edit
}); });
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
if (!ExitConfirmed) if (!ExitConfirmed)
{ {
@ -613,12 +613,12 @@ namespace osu.Game.Screens.Edit
refetchBeatmap(); refetchBeatmap();
return base.OnExiting(next); return base.OnExiting(e);
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
base.OnSuspending(next); base.OnSuspending(e);
clock.Stop(); clock.Stop();
refetchBeatmap(); refetchBeatmap();
} }

View File

@ -44,9 +44,9 @@ namespace osu.Game.Screens.Edit.GameplayTest
protected override bool CheckModsAllowFailure() => false; // never fail. protected override bool CheckModsAllowFailure() => false; // never fail.
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
// finish alpha transforms on entering to avoid gameplay starting in a half-hidden state. // finish alpha transforms on entering to avoid gameplay starting in a half-hidden state.
// the finish calls are purposefully not propagated to children to avoid messing up their state. // the finish calls are purposefully not propagated to children to avoid messing up their state.
@ -54,13 +54,13 @@ namespace osu.Game.Screens.Edit.GameplayTest
GameplayClockContainer.FinishTransforms(false, nameof(Alpha)); GameplayClockContainer.FinishTransforms(false, nameof(Alpha));
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
musicController.Stop(); musicController.Stop();
editorState.Time = GameplayClockContainer.CurrentTime; editorState.Time = GameplayClockContainer.CurrentTime;
editor.RestoreState(editorState); editor.RestoreState(editorState);
return base.OnExiting(next); return base.OnExiting(e);
} }
} }
} }

View File

@ -19,9 +19,9 @@ namespace osu.Game.Screens.Edit.GameplayTest
{ {
} }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
MetadataInfo.FinishTransforms(true); MetadataInfo.FinishTransforms(true);
} }

View File

@ -118,20 +118,20 @@ namespace osu.Game.Screens.Import
fileSelector.CurrentPath.BindValueChanged(directoryChanged); fileSelector.CurrentPath.BindValueChanged(directoryChanged);
} }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
contentContainer.ScaleTo(0.95f).ScaleTo(1, duration, Easing.OutQuint); contentContainer.ScaleTo(0.95f).ScaleTo(1, duration, Easing.OutQuint);
this.FadeInFromZero(duration); this.FadeInFromZero(duration);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
contentContainer.ScaleTo(0.95f, duration, Easing.OutQuint); contentContainer.ScaleTo(0.95f, duration, Easing.OutQuint);
this.FadeOut(duration, Easing.OutQuint); this.FadeOut(duration, Easing.OutQuint);
return base.OnExiting(next); return base.OnExiting(e);
} }
private void directoryChanged(ValueChangedEvent<DirectoryInfo> _) private void directoryChanged(ValueChangedEvent<DirectoryInfo> _)

View File

@ -69,9 +69,9 @@ namespace osu.Game.Screens
private EFToRealmMigrator realmMigrator; private EFToRealmMigrator realmMigrator;
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
LoadComponentAsync(precompiler = CreateShaderPrecompiler(), AddInternal); LoadComponentAsync(precompiler = CreateShaderPrecompiler(), AddInternal);

View File

@ -171,9 +171,9 @@ namespace osu.Game.Screens.Menu
((IBindable<APIUser>)currentUser).BindTo(api.LocalUser); ((IBindable<APIUser>)currentUser).BindTo(api.LocalUser);
} }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
icon.RotateTo(10); icon.RotateTo(10);
icon.FadeOut(); icon.FadeOut();

View File

@ -57,10 +57,10 @@ namespace osu.Game.Screens.Menu
} }
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
this.FadeOut(300); this.FadeOut(300);
base.OnSuspending(next); base.OnSuspending(e);
} }
} }
} }

View File

@ -164,9 +164,9 @@ namespace osu.Game.Screens.Menu
} }
} }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
ensureEventuallyArrivingAtMenu(); ensureEventuallyArrivingAtMenu();
} }
@ -194,7 +194,7 @@ namespace osu.Game.Screens.Menu
}, 5000); }, 5000);
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
this.FadeIn(300); this.FadeIn(300);
@ -237,12 +237,12 @@ namespace osu.Game.Screens.Menu
//don't want to fade out completely else we will stop running updates. //don't want to fade out completely else we will stop running updates.
Game.FadeTo(0.01f, fadeOutTime).OnComplete(_ => this.Exit()); Game.FadeTo(0.01f, fadeOutTime).OnComplete(_ => this.Exit());
base.OnResuming(last); base.OnResuming(e);
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
base.OnSuspending(next); base.OnSuspending(e);
initialBeatmap = null; initialBeatmap = null;
} }

View File

@ -89,9 +89,9 @@ namespace osu.Game.Screens.Menu
} }
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
base.OnSuspending(next); base.OnSuspending(e);
// ensure the background is shown, even if the TriangleIntroSequence failed to do so. // ensure the background is shown, even if the TriangleIntroSequence failed to do so.
background.ApplyToBackground(b => b.Show()); background.ApplyToBackground(b => b.Show());
@ -100,9 +100,9 @@ namespace osu.Game.Screens.Menu
intro.Expire(); intro.Expire();
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
background.FadeOut(100); background.FadeOut(100);
} }

View File

@ -106,9 +106,9 @@ namespace osu.Game.Screens.Menu
} }
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
background.FadeOut(100); background.FadeOut(100);
} }

View File

@ -176,12 +176,12 @@ namespace osu.Game.Screens.Menu
[Resolved] [Resolved]
private Storage storage { get; set; } private Storage storage { get; set; }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
Buttons.FadeInFromZero(500); Buttons.FadeInFromZero(500);
if (last is IntroScreen && musicController.TrackLoaded) if (e.Last is IntroScreen && musicController.TrackLoaded)
{ {
var track = musicController.CurrentTrack; var track = musicController.CurrentTrack;
@ -249,9 +249,9 @@ namespace osu.Game.Screens.Menu
seq.OnAbort(_ => Buttons.SetOsuLogo(null)); seq.OnAbort(_ => Buttons.SetOsuLogo(null));
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
base.OnSuspending(next); base.OnSuspending(e);
Buttons.State = ButtonSystemState.EnteringMode; Buttons.State = ButtonSystemState.EnteringMode;
@ -261,9 +261,9 @@ namespace osu.Game.Screens.Menu
sideFlashes.FadeOut(64, Easing.OutQuint); sideFlashes.FadeOut(64, Easing.OutQuint);
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
ApplyToBackground(b => (b as BackgroundScreenDefault)?.Next()); ApplyToBackground(b => (b as BackgroundScreenDefault)?.Next());
@ -273,7 +273,7 @@ namespace osu.Game.Screens.Menu
musicController.EnsurePlayingSomething(); musicController.EnsurePlayingSomething();
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
if (!exitConfirmed && dialogOverlay != null) if (!exitConfirmed && dialogOverlay != null)
{ {
@ -291,7 +291,7 @@ namespace osu.Game.Screens.Menu
songTicker.Hide(); songTicker.Hide();
this.FadeOut(3000); this.FadeOut(3000);
return base.OnExiting(next); return base.OnExiting(e);
} }
public void PresentBeatmap(WorkingBeatmap beatmap, RulesetInfo ruleset) public void PresentBeatmap(WorkingBeatmap beatmap, RulesetInfo ruleset)

View File

@ -91,15 +91,15 @@ namespace osu.Game.Screens.OnlinePlay.Components
AddInternal(background = newBackground); AddInternal(background = newBackground);
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
base.OnSuspending(next); base.OnSuspending(e);
this.MoveToX(0, TRANSITION_LENGTH); this.MoveToX(0, TRANSITION_LENGTH);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
bool result = base.OnExiting(next); bool result = base.OnExiting(e);
this.MoveToX(0); this.MoveToX(0);
return result; return result;
} }

View File

@ -33,7 +33,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
playlist.Clear(); playlist.Clear();
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
// This screen never exits. // This screen never exits.
return true; return true;

View File

@ -238,15 +238,15 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
#endregion #endregion
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
onReturning(); onReturning();
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
Debug.Assert(selectionLease != null); Debug.Assert(selectionLease != null);
@ -261,16 +261,16 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
onReturning(); onReturning();
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
onLeaving(); onLeaving();
return base.OnExiting(next); return base.OnExiting(e);
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
onLeaving(); onLeaving();
base.OnSuspending(next); base.OnSuspending(e);
} }
protected override void OnFocus(FocusEvent e) protected override void OnFocus(FocusEvent e)

View File

@ -290,35 +290,35 @@ namespace osu.Game.Screens.OnlinePlay.Match
protected void ShowUserModSelect() => userModsSelectOverlay.Show(); protected void ShowUserModSelect() => userModsSelectOverlay.Show();
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
beginHandlingTrack(); beginHandlingTrack();
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
endHandlingTrack(); endHandlingTrack();
base.OnSuspending(next); base.OnSuspending(e);
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
updateWorkingBeatmap(); updateWorkingBeatmap();
beginHandlingTrack(); beginHandlingTrack();
Scheduler.AddOnce(UpdateMods); Scheduler.AddOnce(UpdateMods);
Scheduler.AddOnce(updateRuleset); Scheduler.AddOnce(updateRuleset);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
RoomManager?.PartRoom(); RoomManager?.PartRoom();
Mods.Value = Array.Empty<Mod>(); Mods.Value = Array.Empty<Mod>();
endHandlingTrack(); endHandlingTrack();
return base.OnExiting(next); return base.OnExiting(e);
} }
protected void StartPlay() protected void StartPlay()

View File

@ -35,14 +35,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
transitionFromResults(); transitionFromResults();
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
if (client.Room == null) if (client.Room == null)
return; return;
if (!(last is MultiplayerPlayerLoader playerLoader)) if (!(e.Last is MultiplayerPlayerLoader playerLoader))
return; return;
// If gameplay wasn't finished, then we have a simple path back to the idle state by aborting gameplay. // If gameplay wasn't finished, then we have a simple path back to the idle state by aborting gameplay.

View File

@ -25,13 +25,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
[Resolved] [Resolved]
private MultiplayerClient client { get; set; } private MultiplayerClient client { get; set; }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
// Upon having left a room, we don't know whether we were the only participant, and whether the room is now closed as a result of leaving it. // Upon having left a room, we don't know whether we were the only participant, and whether the room is now closed as a result of leaving it.
// To work around this, temporarily remove the room and trigger an immediate listing poll. // To work around this, temporarily remove the room and trigger an immediate listing poll.
if (last is MultiplayerMatchSubScreen match) if (e.Last is MultiplayerMatchSubScreen match)
{ {
RoomManager.RemoveRoom(match.Room); RoomManager.RemoveRoom(match.Room);
ListingPollingComponent.PollImmediately(); ListingPollingComponent.PollImmediately();

View File

@ -242,14 +242,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
private bool exitConfirmed; private bool exitConfirmed;
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
// the room may not be left immediately after a disconnection due to async flow, // the room may not be left immediately after a disconnection due to async flow,
// so checking the IsConnected status is also required. // so checking the IsConnected status is also required.
if (client.Room == null || !client.IsConnected.Value) if (client.Room == null || !client.IsConnected.Value)
{ {
// room has not been created yet; exit immediately. // room has not been created yet; exit immediately.
return base.OnExiting(next); return base.OnExiting(e);
} }
if (!exitConfirmed && dialogOverlay != null) if (!exitConfirmed && dialogOverlay != null)
@ -268,7 +268,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
return true; return true;
} }
return base.OnExiting(next); return base.OnExiting(e);
} }
private ModSettingChangeTracker modSettingChangeTracker; private ModSettingChangeTracker modSettingChangeTracker;

View File

@ -18,10 +18,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
{ {
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
base.OnSuspending(next); base.OnSuspending(e);
player = (Player)next; player = (Player)e.Next;
} }
} }
} }

View File

@ -110,7 +110,7 @@ namespace osu.Game.Screens.OnlinePlay
} }
} }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
this.FadeIn(); this.FadeIn();
waves.Show(); waves.Show();
@ -118,35 +118,35 @@ namespace osu.Game.Screens.OnlinePlay
Mods.SetDefault(); Mods.SetDefault();
if (loungeSubScreen.IsCurrentScreen()) if (loungeSubScreen.IsCurrentScreen())
loungeSubScreen.OnEntering(last); loungeSubScreen.OnEntering(e);
else else
loungeSubScreen.MakeCurrent(); loungeSubScreen.MakeCurrent();
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
this.FadeIn(250); this.FadeIn(250);
this.ScaleTo(1, 250, Easing.OutSine); this.ScaleTo(1, 250, Easing.OutSine);
Debug.Assert(screenStack.CurrentScreen != null); Debug.Assert(screenStack.CurrentScreen != null);
screenStack.CurrentScreen.OnResuming(last); screenStack.CurrentScreen.OnResuming(e);
base.OnResuming(last); base.OnResuming(e);
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
this.ScaleTo(1.1f, 250, Easing.InSine); this.ScaleTo(1.1f, 250, Easing.InSine);
this.FadeOut(250); this.FadeOut(250);
Debug.Assert(screenStack.CurrentScreen != null); Debug.Assert(screenStack.CurrentScreen != null);
screenStack.CurrentScreen.OnSuspending(next); screenStack.CurrentScreen.OnSuspending(e);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
var subScreen = screenStack.CurrentScreen as Drawable; var subScreen = screenStack.CurrentScreen as Drawable;
if (subScreen?.IsLoaded == true && screenStack.CurrentScreen.OnExiting(next)) if (subScreen?.IsLoaded == true && screenStack.CurrentScreen.OnExiting(e))
return true; return true;
RoomManager.PartRoom(); RoomManager.PartRoom();
@ -155,7 +155,7 @@ namespace osu.Game.Screens.OnlinePlay
this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut(); this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut();
base.OnExiting(next); base.OnExiting(e);
return false; return false;
} }

View File

@ -141,7 +141,7 @@ namespace osu.Game.Screens.OnlinePlay
return base.OnBackButton(); return base.OnBackButton();
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
if (!itemSelected) if (!itemSelected)
{ {
@ -150,7 +150,7 @@ namespace osu.Game.Screens.OnlinePlay
Mods.Value = initialMods; Mods.Value = initialMods;
} }
return base.OnExiting(next); return base.OnExiting(e);
} }
protected override ModSelectOverlay CreateModSelectOverlay() => new UserModSelectOverlay protected override ModSelectOverlay CreateModSelectOverlay() => new UserModSelectOverlay

View File

@ -27,28 +27,28 @@ namespace osu.Game.Screens.OnlinePlay
public const double DISAPPEAR_DURATION = 500; public const double DISAPPEAR_DURATION = 500;
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
this.FadeInFromZero(APPEAR_DURATION, Easing.OutQuint); this.FadeInFromZero(APPEAR_DURATION, Easing.OutQuint);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
base.OnExiting(next); base.OnExiting(e);
this.FadeOut(DISAPPEAR_DURATION, Easing.OutQuint); this.FadeOut(DISAPPEAR_DURATION, Easing.OutQuint);
return false; return false;
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
this.FadeIn(APPEAR_DURATION, Easing.OutQuint); this.FadeIn(APPEAR_DURATION, Easing.OutQuint);
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
base.OnSuspending(next); base.OnSuspending(e);
this.FadeOut(DISAPPEAR_DURATION, Easing.OutQuint); this.FadeOut(DISAPPEAR_DURATION, Easing.OutQuint);
} }

View File

@ -45,9 +45,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
throw new InvalidOperationException("Current Mods do not match PlaylistItem's RequiredMods"); throw new InvalidOperationException("Current Mods do not match PlaylistItem's RequiredMods");
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
if (base.OnExiting(next)) if (base.OnExiting(e))
return true; return true;
Exited?.Invoke(); Exited?.Invoke();

View File

@ -171,7 +171,7 @@ namespace osu.Game.Screens
background.ApplyToBackground(action); background.ApplyToBackground(action);
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
if (PlayResumeSound) if (PlayResumeSound)
sampleExit?.Play(); sampleExit?.Play();
@ -183,19 +183,19 @@ namespace osu.Game.Screens
if (trackAdjustmentStateAtSuspend != null) if (trackAdjustmentStateAtSuspend != null)
musicController.AllowTrackAdjustments = trackAdjustmentStateAtSuspend.Value; musicController.AllowTrackAdjustments = trackAdjustmentStateAtSuspend.Value;
base.OnResuming(last); base.OnResuming(e);
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
base.OnSuspending(next); base.OnSuspending(e);
trackAdjustmentStateAtSuspend = musicController.AllowTrackAdjustments; trackAdjustmentStateAtSuspend = musicController.AllowTrackAdjustments;
onSuspendingLogo(); onSuspendingLogo();
} }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
applyArrivingDefaults(false); applyArrivingDefaults(false);
@ -210,15 +210,15 @@ namespace osu.Game.Screens
} }
background = backgroundStack?.CurrentScreen as BackgroundScreen; background = backgroundStack?.CurrentScreen as BackgroundScreen;
base.OnEntering(last); base.OnEntering(e);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
if (ValidForResume && logo != null) if (ValidForResume && logo != null)
onExitingLogo(); onExitingLogo();
if (base.OnExiting(next)) if (base.OnExiting(e))
return true; return true;
if (ownedBackground != null && backgroundStack?.CurrentScreen == ownedBackground) if (ownedBackground != null && backgroundStack?.CurrentScreen == ownedBackground)

View File

@ -917,9 +917,9 @@ namespace osu.Game.Screens.Play
#region Screen Logic #region Screen Logic
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
if (!LoadedBeatmapSuccessfully) if (!LoadedBeatmapSuccessfully)
return; return;
@ -985,15 +985,15 @@ namespace osu.Game.Screens.Play
GameplayClockContainer.Reset(true); GameplayClockContainer.Reset(true);
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
screenSuspension?.RemoveAndDisposeImmediately(); screenSuspension?.RemoveAndDisposeImmediately();
fadeOut(); fadeOut();
base.OnSuspending(next); base.OnSuspending(e);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
screenSuspension?.RemoveAndDisposeImmediately(); screenSuspension?.RemoveAndDisposeImmediately();
failAnimationLayer?.RemoveFilters(); failAnimationLayer?.RemoveFilters();
@ -1024,7 +1024,7 @@ namespace osu.Game.Screens.Play
musicController.ResetTrackAdjustments(); musicController.ResetTrackAdjustments();
fadeOut(); fadeOut();
return base.OnExiting(next); return base.OnExiting(e);
} }
/// <summary> /// <summary>

View File

@ -210,9 +210,9 @@ namespace osu.Game.Screens.Play
#region Screen handling #region Screen handling
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
ApplyToBackground(b => ApplyToBackground(b =>
{ {
@ -236,9 +236,9 @@ namespace osu.Game.Screens.Play
showBatteryWarningIfNeeded(); showBatteryWarningIfNeeded();
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
Debug.Assert(CurrentPlayer != null); Debug.Assert(CurrentPlayer != null);
@ -254,9 +254,9 @@ namespace osu.Game.Screens.Play
contentIn(); contentIn();
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
base.OnSuspending(next); base.OnSuspending(e);
BackgroundBrightnessReduction = false; BackgroundBrightnessReduction = false;
@ -268,7 +268,7 @@ namespace osu.Game.Screens.Play
highPassFilter.CutoffTo(0); highPassFilter.CutoffTo(0);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
cancelLoad(); cancelLoad();
ContentOut(); ContentOut();
@ -284,7 +284,7 @@ namespace osu.Game.Screens.Play
BackgroundBrightnessReduction = false; BackgroundBrightnessReduction = false;
Beatmap.Value.Track.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment); Beatmap.Value.Track.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment);
return base.OnExiting(next); return base.OnExiting(e);
} }
protected override void LogoArriving(OsuLogo logo, bool resuming) protected override void LogoArriving(OsuLogo logo, bool resuming)

View File

@ -20,13 +20,13 @@ namespace osu.Game.Screens.Play
Score = score.ScoreInfo; Score = score.ScoreInfo;
} }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
// these will be reverted thanks to PlayerLoader's lease. // these will be reverted thanks to PlayerLoader's lease.
Mods.Value = Score.Mods; Mods.Value = Score.Mods;
Ruleset.Value = Score.Ruleset; Ruleset.Value = Score.Ruleset;
base.OnEntering(last); base.OnEntering(e);
} }
} }
} }

View File

@ -249,10 +249,10 @@ namespace osu.Game.Screens.Play
beatmapDownloader.Download(beatmapSet); beatmapDownloader.Download(beatmapSet);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
previewTrackManager.StopAnyPlaying(this); previewTrackManager.StopAnyPlaying(this);
return base.OnExiting(next); return base.OnExiting(e);
} }
} }
} }

View File

@ -24,11 +24,11 @@ namespace osu.Game.Screens.Play
SpectatorClient.OnUserBeganPlaying += userBeganPlaying; SpectatorClient.OnUserBeganPlaying += userBeganPlaying;
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
SpectatorClient.OnUserBeganPlaying -= userBeganPlaying; SpectatorClient.OnUserBeganPlaying -= userBeganPlaying;
return base.OnExiting(next); return base.OnExiting(e);
} }
private void userBeganPlaying(int userId, SpectatorState state) private void userBeganPlaying(int userId, SpectatorState state)

View File

@ -91,11 +91,11 @@ namespace osu.Game.Screens.Play
DrawableRuleset?.SetReplayScore(score); DrawableRuleset?.SetReplayScore(score);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
SpectatorClient.OnNewFrames -= userSentFrames; SpectatorClient.OnNewFrames -= userSentFrames;
return base.OnExiting(next); return base.OnExiting(e);
} }
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)

View File

@ -20,13 +20,13 @@ namespace osu.Game.Screens.Play
Score = score.ScoreInfo; Score = score.ScoreInfo;
} }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
// these will be reverted thanks to PlayerLoader's lease. // these will be reverted thanks to PlayerLoader's lease.
Mods.Value = Score.Mods; Mods.Value = Score.Mods;
Ruleset.Value = Score.Ruleset; Ruleset.Value = Score.Ruleset;
base.OnEntering(last); base.OnEntering(e);
} }
} }
} }

View File

@ -115,9 +115,9 @@ namespace osu.Game.Screens.Play
await submitScore(score).ConfigureAwait(false); await submitScore(score).ConfigureAwait(false);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
bool exiting = base.OnExiting(next); bool exiting = base.OnExiting(e);
if (LoadedBeatmapSuccessfully) if (LoadedBeatmapSuccessfully)
submitScore(Score.DeepClone()); submitScore(Score.DeepClone());

View File

@ -231,9 +231,9 @@ namespace osu.Game.Screens.Ranking
lastFetchCompleted = true; lastFetchCompleted = true;
}); });
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
ApplyToBackground(b => ApplyToBackground(b =>
{ {
@ -244,9 +244,9 @@ namespace osu.Game.Screens.Ranking
bottomPanel.FadeTo(1, 250); bottomPanel.FadeTo(1, 250);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
if (base.OnExiting(next)) if (base.OnExiting(e))
return true; return true;
this.FadeOut(100); this.FadeOut(100);

View File

@ -28,25 +28,25 @@ namespace osu.Game.Screens
protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg2"); protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg2");
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
message.TextContainer.MoveTo(new Vector2(DrawSize.X / 16, 0), transition_time, Easing.OutExpo); message.TextContainer.MoveTo(new Vector2(DrawSize.X / 16, 0), transition_time, Easing.OutExpo);
this.FadeOut(transition_time, Easing.OutExpo); this.FadeOut(transition_time, Easing.OutExpo);
return base.OnExiting(next); return base.OnExiting(e);
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
base.OnSuspending(next); base.OnSuspending(e);
message.TextContainer.MoveTo(new Vector2(-(DrawSize.X / 16), 0), transition_time, Easing.OutExpo); message.TextContainer.MoveTo(new Vector2(-(DrawSize.X / 16), 0), transition_time, Easing.OutExpo);
this.FadeOut(transition_time, Easing.OutExpo); this.FadeOut(transition_time, Easing.OutExpo);
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
message.TextContainer.MoveTo(Vector2.Zero, transition_time, Easing.OutExpo); message.TextContainer.MoveTo(Vector2.Zero, transition_time, Easing.OutExpo);
this.FadeIn(transition_time, Easing.OutExpo); this.FadeIn(transition_time, Easing.OutExpo);

View File

@ -109,9 +109,9 @@ namespace osu.Game.Screens.Select
} }
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
if (playerLoader != null) if (playerLoader != null)
{ {

View File

@ -543,9 +543,9 @@ namespace osu.Game.Screens.Select
} }
} }
public override void OnEntering(IScreen last) public override void OnEntering(ScreenTransitionEvent e)
{ {
base.OnEntering(last); base.OnEntering(e);
this.FadeInFromZero(250); this.FadeInFromZero(250);
FilterControl.Activate(); FilterControl.Activate();
@ -591,9 +591,9 @@ namespace osu.Game.Screens.Select
logo.FadeOut(logo_transition / 2, Easing.Out); logo.FadeOut(logo_transition / 2, Easing.Out);
} }
public override void OnResuming(IScreen last) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(last); base.OnResuming(e);
// required due to https://github.com/ppy/osu-framework/issues/3218 // required due to https://github.com/ppy/osu-framework/issues/3218
ModSelect.SelectedMods.Disabled = false; ModSelect.SelectedMods.Disabled = false;
@ -622,7 +622,7 @@ namespace osu.Game.Screens.Select
FilterControl.Activate(); FilterControl.Activate();
} }
public override void OnSuspending(IScreen next) public override void OnSuspending(ScreenTransitionEvent e)
{ {
// Handle the case where FinaliseSelection is never called (ie. when a screen is pushed externally). // Handle the case where FinaliseSelection is never called (ie. when a screen is pushed externally).
// Without this, it's possible for a transfer to happen while we are not the current screen. // Without this, it's possible for a transfer to happen while we are not the current screen.
@ -640,12 +640,12 @@ namespace osu.Game.Screens.Select
this.FadeOut(250); this.FadeOut(250);
FilterControl.Deactivate(); FilterControl.Deactivate();
base.OnSuspending(next); base.OnSuspending(e);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
if (base.OnExiting(next)) if (base.OnExiting(e))
return true; return true;
beatmapInfoWedge.Hide(); beatmapInfoWedge.Hide();

View File

@ -146,8 +146,10 @@ namespace osu.Game.Skinning.Editor
{ {
anchorLine = new Box anchorLine = new Box
{ {
Colour = Color4.Yellow,
Height = 2, Height = 2,
Origin = Anchor.CentreLeft,
Colour = Color4.Yellow,
EdgeSmoothness = Vector2.One
}, },
originBox = new Box originBox = new Box
{ {

View File

@ -118,7 +118,7 @@ namespace osu.Game.Tests.Visual
public new bool HasUnsavedChanges => base.HasUnsavedChanges; public new bool HasUnsavedChanges => base.HasUnsavedChanges;
public override bool OnExiting(IScreen next) public override bool OnExiting(ScreenExitEvent e)
{ {
// For testing purposes allow the screen to exit without saving on second attempt. // For testing purposes allow the screen to exit without saving on second attempt.
if (!ExitConfirmed && dialogOverlay?.CurrentDialog is PromptForSaveDialog saveDialog) if (!ExitConfirmed && dialogOverlay?.CurrentDialog is PromptForSaveDialog saveDialog)
@ -127,7 +127,7 @@ namespace osu.Game.Tests.Visual
return true; return true;
} }
return base.OnExiting(next); return base.OnExiting(e);
} }
public TestEditor(EditorLoader loader = null) public TestEditor(EditorLoader loader = null)

View File

@ -35,8 +35,8 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Realm" Version="10.10.0" /> <PackageReference Include="Realm" Version="10.10.0" />
<PackageReference Include="ppy.osu.Framework" Version="2022.419.0" /> <PackageReference Include="ppy.osu.Framework" Version="2022.421.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.417.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2022.422.0" />
<PackageReference Include="Sentry" Version="3.14.1" /> <PackageReference Include="Sentry" Version="3.14.1" />
<PackageReference Include="SharpCompress" Version="0.30.1" /> <PackageReference Include="SharpCompress" Version="0.30.1" />
<PackageReference Include="NUnit" Version="3.13.2" /> <PackageReference Include="NUnit" Version="3.13.2" />

View File

@ -61,8 +61,8 @@
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="Package References"> <ItemGroup Label="Package References">
<PackageReference Include="ppy.osu.Framework.iOS" Version="2022.419.0" /> <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.421.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.417.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2022.422.0" />
</ItemGroup> </ItemGroup>
<!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) --> <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
<PropertyGroup> <PropertyGroup>
@ -84,7 +84,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="ppy.osu.Framework" Version="2022.419.0" /> <PackageReference Include="ppy.osu.Framework" Version="2022.421.0" />
<PackageReference Include="SharpCompress" Version="0.30.1" /> <PackageReference Include="SharpCompress" Version="0.30.1" />
<PackageReference Include="NUnit" Version="3.13.2" /> <PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />