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

CI fixes, switch RoomInspector to use BeatmapSetCover.

Browse Source
This commit is contained in:
DrabWeb
2017-07-13 01:24:59 -03:00
parent fea40ccc1a
commit b196b1d3c6
3 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/Drawables/BeatmapSetCover.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Game.Database; using osu.Game.Database;
namespace osu.Game namespace osu.Game.Beatmaps.Drawables
{ {
public class BeatmapSetCover : Sprite public class BeatmapSetCover : Sprite
{ {

4
osu.Game/Screens/Multiplayer/DrawableRoom.cs
View File

@ -9,8 +9,8 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Textures;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Database; using osu.Game.Database;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
@ -182,7 +182,7 @@ namespace osu.Game.Screens.Multiplayer
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours, TextureStore textures, LocalisationEngine localisation) private void load(OsuColour colours, LocalisationEngine localisation)
{ {
this.localisation = localisation; this.localisation = localisation;
this.colours = colours; this.colours = colours;

21
osu.Game/Screens/Multiplayer/RoomInspector.cs
View File

@ -12,8 +12,6 @@ using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Beatmaps.Drawables; using osu.Game.Beatmaps.Drawables;
using osu.Game.Database; using osu.Game.Database;
@ -332,7 +330,7 @@ namespace osu.Game.Screens.Multiplayer
coverContainer.FadeIn(transition_duration); coverContainer.FadeIn(transition_duration);
coverContainer.Children = new[] coverContainer.Children = new[]
{ {
new AsyncLoadWrapper(new CoverSprite(value.BeatmapSet) new AsyncLoadWrapper(new BeatmapSetCover(value.BeatmapSet)
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -409,22 +407,5 @@ namespace osu.Game.Screens.Multiplayer
}; };
} }
} }
private class CoverSprite : Sprite
{
private readonly BeatmapSetInfo set;
public CoverSprite(BeatmapSetInfo set)
{
this.set = set;
}
[BackgroundDependencyLoader]
private void load(TextureStore textures)
{
if (set.OnlineInfo?.Covers?.Cover != null)
Texture = textures.Get(set.OnlineInfo.Covers.Cover);
}
}
} }
} }