sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1742 from peppy/improve-screen-offset

Browse Source 
Add special logic to song select to avoid obvious clipping when notifications are displayed
This commit is contained in:
Dan Balasescu
2017-12-26 18:01:28 +09:00
committed by GitHub
parent e65aba83fa 11542b697c
commit b7c2461a39
2 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Select/FilterControl.cs
View File

@ -75,7 +75,7 @@ namespace osu.Game.Screens.Select
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
new Box Background = new Box
{ {
Colour = Color4.Black, Colour = Color4.Black,
Alpha = 0.8f, Alpha = 0.8f,
@ -167,6 +167,8 @@ namespace osu.Game.Screens.Select
private Bindable<bool> showConverted; private Bindable<bool> showConverted;
public readonly Box Background;
[BackgroundDependencyLoader(permitNulls: true)] [BackgroundDependencyLoader(permitNulls: true)]
private void load(OsuColour colours, OsuGame osu, OsuConfigManager config) private void load(OsuColour colours, OsuGame osu, OsuConfigManager config)
{ {

48
osu.Game/Screens/Select/SongSelect.cs
View File

@ -103,21 +103,41 @@ namespace osu.Game.Screens.Select
Right = left_area_padding * 2, Right = left_area_padding * 2,
} }
}, },
carousel = new BeatmapCarousel new Container
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Both,
Size = new Vector2(carousel_width, 1), Masking = true,
Anchor = Anchor.CentreRight, Anchor = Anchor.Centre,
Origin = Anchor.CentreRight, Origin = Anchor.Centre,
SelectionChanged = carouselSelectionChanged, Width = 2, //avoid horizontal masking so the panels don't clip when screen stack is pushed.
BeatmapSetsChanged = carouselBeatmapsLoaded, Child = new Container
}, {
FilterControl = new FilterControl RelativeSizeAxes = Axes.Both,
{ Anchor = Anchor.Centre,
RelativeSizeAxes = Axes.X, Origin = Anchor.Centre,
Height = filter_height, Width = 0.5f,
FilterChanged = c => carousel.Filter(c), Children = new Drawable[]
Exit = Exit, {
carousel = new BeatmapCarousel
{
Masking = false,
RelativeSizeAxes = Axes.Y,
Size = new Vector2(carousel_width, 1),
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
SelectionChanged = carouselSelectionChanged,
BeatmapSetsChanged = carouselBeatmapsLoaded,
},
FilterControl = new FilterControl
{
RelativeSizeAxes = Axes.X,
Height = filter_height,
FilterChanged = c => carousel.Filter(c),
Background = { Width = 2 },
Exit = Exit,
},
}
},
}, },
beatmapInfoWedge = new BeatmapInfoWedge beatmapInfoWedge = new BeatmapInfoWedge
{ {