h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 22:22:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #23882 from peppy/focused-overlay-container-override-fixes

Browse Source 
Apply osu! side changes in line with `FocusedOverlayContainer.PopIn` `abstract` change
This commit is contained in:
Bartłomiej Dach 2023-06-18 15:05:58 +02:00 committed by GitHub
commit 5dc675ab65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Android.props
View File

@ -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" />

4
osu.Game.Tests/Visual/UserInterface/TestSceneOverlayContainer.cs
View File

@ -101,6 +101,10 @@ namespace osu.Game.Tests.Visual.UserInterface
},
};
}
protected override void PopIn()
{
}
}
}
}

2
osu.Game/Collections/ManageCollectionsDialog.cs
View File

@ -114,8 +114,6 @@ namespace osu.Game.Collections
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);

1
osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
View File

@ -152,7 +152,6 @@ namespace osu.Game.Graphics.Containers
protected override void PopOut()
{
base.PopOut();
previewTrackManager.StopAnyPlaying(this);
}

1
osu.Game/Overlays/AccountCreationOverlay.cs
View File

@ -90,7 +90,6 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
base.PopIn();
this.FadeIn(transition_time, Easing.OutQuint);
if (welcomeScreen.GetChildScreen() != null)

2
osu.Game/Overlays/ChatOverlay.cs
View File

@ -276,8 +276,6 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
base.PopIn();
this.MoveToY(0, transition_length, Easing.OutQuint);
this.FadeIn(transition_length, Easing.OutQuint);
}

1
osu.Game/Overlays/DialogOverlay.cs
View File

@ -99,7 +99,6 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
base.PopIn();
lowPassFilter.CutoffTo(300, 100, Easing.OutCubic);
}

2
osu.Game/Overlays/LoginOverlay.cs
View File

@ -75,8 +75,6 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
base.PopIn();
panel.Bounding = true;
this.FadeIn(transition_time, Easing.OutQuint);

6
osu.Game/Overlays/MedalOverlay.cs
View File

@ -246,9 +246,13 @@ namespace osu.Game.Overlays
}
}
protected override void PopIn()
{
this.FadeIn(200);
}
protected override void PopOut()
{
base.PopOut();
this.FadeOut(200);
}

1
osu.Game/Overlays/Mods/ShearedOverlayContainer.cs
View File

@ -130,7 +130,6 @@ namespace osu.Game.Overlays.Mods
{
const double fade_in_duration = 400;
base.PopIn();
this.FadeIn(fade_in_duration, Easing.OutQuint);
Header.MoveToY(0, fade_in_duration, Easing.OutQuint);

2
osu.Game/Overlays/NotificationOverlay.cs
View File

@ -206,8 +206,6 @@ namespace osu.Game.Overlays
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);

2
osu.Game/Overlays/NowPlayingOverlay.cs
View File

@ -229,8 +229,6 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
base.PopIn();
this.FadeIn(transition_length, Easing.OutQuint);
dragContainer.ScaleTo(1, transition_length, Easing.OutElastic);
}

2
osu.Game/Overlays/SettingsPanel.cs
View File

@ -163,8 +163,6 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
base.PopIn();
ContentContainer.MoveToX(ExpandedPosition, TRANSITION_LENGTH, Easing.OutQuint);
SectionsContainer.FadeEdgeEffectTo(WaveContainer.SHADOW_OPACITY, WaveContainer.APPEAR_DURATION, Easing.Out);

2
osu.Game/Overlays/WaveOverlayContainer.cs
View File

@ -34,8 +34,6 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
base.PopIn();
Waves.Show();
this.FadeIn(100, Easing.OutQuint);
}

2
osu.Game/Screens/OnlinePlay/Match/Components/RoomSettingsOverlay.cs
View File

@ -54,14 +54,12 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
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);
}

2
osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
View File

@ -86,8 +86,6 @@ namespace osu.Game.Screens.Select.Options
protected override void PopIn()
{
base.PopIn();
this.FadeIn(transition_duration, Easing.OutQuint);
if (buttonsContainer.Position.X == 1 || Alpha == 0)

2
osu.Game/osu.Game.csproj
View File

@ -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" />

2
osu.iOS.props
View File

@ -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>