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

Fix CI issues

Browse Source
This commit is contained in:
Lucas A
2019-12-13 18:59:40 +01:00
parent e05c9426ed
commit 43720fbf45
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
View File

@ -3,7 +3,6 @@
using System; using System;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Overlays.News; using osu.Game.Overlays.News;
@ -37,10 +36,10 @@ namespace osu.Game.Tests.Visual.Online
{ {
Spacing = new osuTK.Vector2(0, 10); Spacing = new osuTK.Vector2(0, 10);
var article = new NewsArticleCover.ArticleInfo() var article = new NewsArticleCover.ArticleInfo
{ {
Author = "Ephemeral", Author = "Ephemeral",
CoverURL = "https://assets.ppy.sh/artists/58/header.jpg", CoverUrl = "https://assets.ppy.sh/artists/58/header.jpg",
Time = new DateTime(2019, 12, 4), Time = new DateTime(2019, 12, 4),
Title = "New Featured Artist: Kurokotei" Title = "New Featured Artist: Kurokotei"
}; };

17
osu.Game/Overlays/News/NewsArticleCover.cs
View File

@ -1,4 +1,7 @@
using System; // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -31,7 +34,7 @@ namespace osu.Game.Overlays.News
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = ColourInfo.GradientVertical(OsuColour.Gray(0.2f), OsuColour.Gray(0.1f)) Colour = ColourInfo.GradientVertical(OsuColour.Gray(0.2f), OsuColour.Gray(0.1f))
}, },
new DelayedLoadWrapper(bg = new NewsBackground(info.CoverURL) new DelayedLoadWrapper(bg = new NewsBackground(info.CoverUrl)
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -52,7 +55,7 @@ namespace osu.Game.Overlays.News
}, },
new DateContainer(info.Time) new DateContainer(info.Time)
{ {
Margin = new MarginPadding() Margin = new MarginPadding
{ {
Right = 20, Right = 20,
Top = 20, Top = 20,
@ -62,7 +65,7 @@ namespace osu.Game.Overlays.News
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Margin = new MarginPadding() Margin = new MarginPadding
{ {
Left = 25, Left = 25,
Bottom = 50, Bottom = 50,
@ -74,7 +77,7 @@ namespace osu.Game.Overlays.News
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Margin = new MarginPadding() Margin = new MarginPadding
{ {
Left = 25, Left = 25,
Bottom = 30, Bottom = 30,
@ -132,7 +135,7 @@ namespace osu.Game.Overlays.News
Origin = Anchor.Centre, Origin = Anchor.Centre,
Font = OsuFont.GetFont(Typeface.Exo, 12, FontWeight.Black, false, false), Font = OsuFont.GetFont(Typeface.Exo, 12, FontWeight.Black, false, false),
Text = date.ToString("dd MMM yyy"), Text = date.ToString("dd MMM yyy"),
Margin = new MarginPadding() Margin = new MarginPadding
{ {
Vertical = 4, Vertical = 4,
Horizontal = 8, Horizontal = 8,
@ -148,7 +151,7 @@ namespace osu.Game.Overlays.News
public class ArticleInfo public class ArticleInfo
{ {
public string Title { get; set; } public string Title { get; set; }
public string CoverURL { get; set; } public string CoverUrl { get; set; }
public DateTime Time { get; set; } public DateTime Time { get; set; }
public string Author { get; set; } public string Author { get; set; }
} }