sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-03 20:57:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix CI errors

Browse Source
This commit is contained in:
Joehu 2019-09-24 16:48:22 -07:00
parent 9861b21440
commit 102dbd85bd
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
View File

@ -115,7 +115,7 @@ namespace osu.Game.Tests.Visual.SongSelect
} }
[Test] [Test]
public void testNullBeatmap() public void TestNullBeatmap()
{ {
selectBeatmap(null); selectBeatmap(null);
AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Text)); AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Text));
@ -126,7 +126,7 @@ namespace osu.Game.Tests.Visual.SongSelect
} }
[Test] [Test]
public void testTruncation() public void TestTruncation()
{ {
selectBeatmap(createLongMetadata()); selectBeatmap(createLongMetadata());
} }
@ -178,12 +178,12 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
Metadata = new BeatmapMetadata Metadata = new BeatmapMetadata
{ {
AuthorString = $"WWWWWWWWWWWWWWW", AuthorString = "WWWWWWWWWWWWWWW",
Artist = $"Verrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Artist", Artist = "Verrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Artist",
Source = $"Verrrrry long Source", Source = "Verrrrry long Source",
Title = $"Verrrrry long Title" Title = "Verrrrry long Title"
}, },
Version = $"Verrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Version", Version = "Verrrrrrrrrrrrrrrrrrrrrrrrrrrrry long Version",
Status = BeatmapSetOnlineStatus.Graveyard, Status = BeatmapSetOnlineStatus.Graveyard,
}, },
}; };

2
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -33,7 +33,7 @@ namespace osu.Game.Screens.Select
{ {
private const float shear_width = 36.75f; private const float shear_width = 36.75f;
private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.wedged_container_size.Y, 0); private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.WEDGED_CONTAINER_SIZE.Y, 0);
private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>(); private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();

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

@ -41,7 +41,7 @@ namespace osu.Game.Screens.Select
{ {
public abstract class SongSelect : OsuScreen, IKeyBindingHandler<GlobalAction> public abstract class SongSelect : OsuScreen, IKeyBindingHandler<GlobalAction>
{ {
public static readonly Vector2 wedged_container_size = new Vector2(0.5f, 245); public static readonly Vector2 WEDGED_CONTAINER_SIZE = new Vector2(0.5f, 245);
protected const float BACKGROUND_BLUR = 20; protected const float BACKGROUND_BLUR = 20;
private const float left_area_padding = 20; private const float left_area_padding = 20;
@ -109,7 +109,7 @@ namespace osu.Game.Screens.Select
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Right = -150 }, Padding = new MarginPadding { Right = -150 },
Size = new Vector2(wedged_container_size.X, 1), Size = new Vector2(WEDGED_CONTAINER_SIZE.X, 1),
} }
} }
}, },
@ -118,11 +118,11 @@ namespace osu.Game.Screens.Select
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Size = new Vector2(wedged_container_size.X, 1), Size = new Vector2(WEDGED_CONTAINER_SIZE.X, 1),
Padding = new MarginPadding Padding = new MarginPadding
{ {
Bottom = Footer.HEIGHT, Bottom = Footer.HEIGHT,
Top = wedged_container_size.Y + left_area_padding, Top = WEDGED_CONTAINER_SIZE.Y + left_area_padding,
Left = left_area_padding, Left = left_area_padding,
Right = left_area_padding * 2, Right = left_area_padding * 2,
}, },
@ -158,7 +158,7 @@ namespace osu.Game.Screens.Select
Child = Carousel = new BeatmapCarousel Child = Carousel = new BeatmapCarousel
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Size = new Vector2(1 - wedged_container_size.X, 1), Size = new Vector2(1 - WEDGED_CONTAINER_SIZE.X, 1),
Anchor = Anchor.CentreRight, Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
SelectionChanged = updateSelectedBeatmap, SelectionChanged = updateSelectedBeatmap,
@ -182,7 +182,7 @@ namespace osu.Game.Screens.Select
}, },
beatmapInfoWedge = new BeatmapInfoWedge beatmapInfoWedge = new BeatmapInfoWedge
{ {
Size = wedged_container_size, Size = WEDGED_CONTAINER_SIZE,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Margin = new MarginPadding Margin = new MarginPadding
{ {