Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply osu! side changes in line with FocusedOverlayContainer.PopIn abstract change #23882

Merged
merged 2 commits into from
Jun 18, 2023
Merged

Apply osu! side changes in line with FocusedOverlayContainer.PopIn abstract change #23882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb31fde
Apply osu! side changes in line with `FocusedOverlayContainer.PopIn` …
peppy Jun 12, 2023
d9c00fc
Update framework
peppy Jun 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion osu.Android.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Framework.Android" Version="2023.608.0" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2023.618.0" />
</ItemGroup>
<ItemGroup>
<AndroidManifestOverlay Include="$(MSBuildThisFileDirectory)osu.Android\Properties\AndroidManifestOverlay.xml" />
Expand Down
4 changes: 4 additions & 0 deletions osu.Game.Tests/Visual/UserInterface/TestSceneOverlayContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ private void load()
},
};
}

protected override void PopIn()
{
}
}
}
}
2 changes: 0 additions & 2 deletions osu.Game/Collections/ManageCollectionsDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ private void load(OsuColour colours, AudioManager audio)

protected override void PopIn()
{
base.PopIn();

lowPassFilter.CutoffTo(300, 100, Easing.OutCubic);
this.FadeIn(enter_duration, Easing.OutQuint);
this.ScaleTo(0.9f).Then().ScaleTo(1f, enter_duration, Easing.OutQuint);
Expand Down
1 change: 0 additions & 1 deletion osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ protected override void UpdateState(ValueChangedEvent<Visibility> state)

protected override void PopOut()
{
base.PopOut();
previewTrackManager.StopAnyPlaying(this);
}

Expand Down
1 change: 0 additions & 1 deletion osu.Game/Overlays/AccountCreationOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ private void load(IAPIProvider api)

protected override void PopIn()
{
base.PopIn();
this.FadeIn(transition_time, Easing.OutQuint);

if (welcomeScreen.GetChildScreen() != null)
Expand Down
2 changes: 0 additions & 2 deletions osu.Game/Overlays/ChatOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,6 @@ protected override void OnDragEnd(DragEndEvent e)

protected override void PopIn()
{
base.PopIn();

this.MoveToY(0, transition_length, Easing.OutQuint);
this.FadeIn(transition_length, Easing.OutQuint);
}
Expand Down
1 change: 0 additions & 1 deletion osu.Game/Overlays/DialogOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ void dismiss()

protected override void PopIn()
{
base.PopIn();
lowPassFilter.CutoffTo(300, 100, Easing.OutCubic);
}

Expand Down
2 changes: 0 additions & 2 deletions osu.Game/Overlays/LoginOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ private void load(OsuColour colours)

protected override void PopIn()
{
base.PopIn();

panel.Bounding = true;
this.FadeIn(transition_time, Easing.OutQuint);

Expand Down
6 changes: 5 additions & 1 deletion osu.Game/Overlays/MedalOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,13 @@ private void startAnimation()
}
}

protected override void PopIn()
{
this.FadeIn(200);
}

protected override void PopOut()
{
base.PopOut();
this.FadeOut(200);
}

Expand Down
1 change: 0 additions & 1 deletion osu.Game/Overlays/Mods/ShearedOverlayContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ protected override void PopIn()
{
const double fade_in_duration = 400;

base.PopIn();
this.FadeIn(fade_in_duration, Easing.OutQuint);

Header.MoveToY(0, fade_in_duration, Easing.OutQuint);
Expand Down
2 changes: 0 additions & 2 deletions osu.Game/Overlays/NotificationOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,6 @@ protected override void Update()

protected override void PopIn()
{
base.PopIn();

this.MoveToX(0, TRANSITION_LENGTH, Easing.OutQuint);
mainContent.FadeTo(1, TRANSITION_LENGTH, Easing.OutQuint);
mainContent.FadeEdgeEffectTo(WaveContainer.SHADOW_OPACITY, WaveContainer.APPEAR_DURATION, Easing.Out);
Expand Down
2 changes: 0 additions & 2 deletions osu.Game/Overlays/NowPlayingOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,6 @@ protected override void LoadComplete()

protected override void PopIn()
{
base.PopIn();

this.FadeIn(transition_length, Easing.OutQuint);
dragContainer.ScaleTo(1, transition_length, Easing.OutElastic);
}
Expand Down
2 changes: 0 additions & 2 deletions osu.Game/Overlays/SettingsPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ protected void AddSection(SettingsSection section)

protected override void PopIn()
{
base.PopIn();

ContentContainer.MoveToX(ExpandedPosition, TRANSITION_LENGTH, Easing.OutQuint);

SectionsContainer.FadeEdgeEffectTo(WaveContainer.SHADOW_OPACITY, WaveContainer.APPEAR_DURATION, Easing.Out);
Expand Down
2 changes: 0 additions & 2 deletions osu.Game/Overlays/WaveOverlayContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ protected WaveOverlayContainer()

protected override void PopIn()
{
base.PopIn();

Waves.Show();
this.FadeIn(100, Easing.OutQuint);
}
Expand Down
2 changes: 0 additions & 2 deletions osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,12 @@ private void load()

protected override void PopIn()
{
base.PopIn();
Settings.MoveToY(0, TRANSITION_DURATION, Easing.OutQuint);
Settings.FadeIn(TRANSITION_DURATION / 2);
}

protected override void PopOut()
{
base.PopOut();
Settings.MoveToY(-1, TRANSITION_DURATION, Easing.InSine);
Settings.Delay(TRANSITION_DURATION / 2).FadeOut(TRANSITION_DURATION / 2);
}
Expand Down
2 changes: 0 additions & 2 deletions osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@ public void AddButton(LocalisableString firstLine, string secondLine, IconUsage

protected override void PopIn()
{
base.PopIn();

this.FadeIn(transition_duration, Easing.OutQuint);

if (buttonsContainer.Position.X == 1 || Alpha == 0)
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/osu.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Realm" Version="10.20.0" />
<PackageReference Include="ppy.osu.Framework" Version="2023.608.0" />
<PackageReference Include="ppy.osu.Framework" Version="2023.618.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2023.605.0" />
<PackageReference Include="Sentry" Version="3.28.1" />
<PackageReference Include="SharpCompress" Version="0.32.2" />
Expand Down
2 changes: 1 addition & 1 deletion osu.iOS.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
<RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Framework.iOS" Version="2023.608.0" />
<PackageReference Include="ppy.osu.Framework.iOS" Version="2023.618.0" />
</ItemGroup>
</Project>