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

Resolve room settings layout issues

Browse Source
This commit is contained in:
smoogipoo 2021-08-18 15:29:01 +09:00
parent 228ad98b39
commit 744b6749d1
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
{ {
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
Masking = true; Masking = true;
CornerRadius = 10;
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -47,12 +48,14 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
{ {
base.PopIn(); base.PopIn();
Settings.MoveToY(0, TRANSITION_DURATION, Easing.OutQuint); Settings.MoveToY(0, TRANSITION_DURATION, Easing.OutQuint);
Settings.FadeIn(TRANSITION_DURATION / 2);
} }
protected override void PopOut() protected override void PopOut()
{ {
base.PopOut(); base.PopOut();
Settings.MoveToY(-1, TRANSITION_DURATION, Easing.InSine); Settings.MoveToY(-1, TRANSITION_DURATION, Easing.InSine);
Settings.Delay(TRANSITION_DURATION / 2).FadeOut(TRANSITION_DURATION / 2);
} }
public bool OnPressed(GlobalAction action) public bool OnPressed(GlobalAction action)

12
osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
View File

@ -165,10 +165,16 @@ namespace osu.Game.Screens.OnlinePlay.Match
} }
} }
}, },
settingsOverlay = CreateRoomSettingsOverlay().With(s => new Container
{ {
s.State.Value = room.RoomID.Value == null ? Visibility.Visible : Visibility.Hidden; RelativeSizeAxes = Axes.Both,
}) // Resolves 1px masking errors between the settings overlay and the room panel.
Padding = new MarginPadding(-1),
Child = settingsOverlay = CreateRoomSettingsOverlay().With(s =>
{
s.State.Value = room.RoomID.Value == null ? Visibility.Visible : Visibility.Hidden;
})
}
}, },
}, },
}, },