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

Fix warnings/remove obsolete usages

Browse Source
This commit is contained in:
smoogipoo 2019-04-25 18:05:46 +09:00
parent 3b0d4c1bad
commit 1766ed8f9e
5 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
View File

@ -48,12 +48,12 @@ namespace osu.Game.Overlays.Profile.Header
Spacing = new Vector2(0, 10), Spacing = new Vector2(0, 10),
Children = new Drawable[] Children = new Drawable[]
{ {
bottomTopLinkContainer = new LinkFlowContainer(text => text.TextSize = 12) bottomTopLinkContainer = new LinkFlowContainer(text => text.Font = text.Font.With(size: 12))
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
}, },
bottomLinkContainer = new LinkFlowContainer(text => text.TextSize = 12) bottomLinkContainer = new LinkFlowContainer(text => text.Font = text.Font.With(size: 12))
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
@ -68,7 +68,7 @@ namespace osu.Game.Overlays.Profile.Header
private void updateDisplay(User user) private void updateDisplay(User user)
{ {
void bold(SpriteText t) => t.Font = @"Exo2.0-Bold"; void bold(SpriteText t) => t.Font = t.Font.With(weight: FontWeight.Bold);
void addSpacer(OsuTextFlowContainer textFlow) => textFlow.AddArbitraryDrawable(new Container { Width = 15 }); void addSpacer(OsuTextFlowContainer textFlow) => textFlow.AddArbitraryDrawable(new Container { Width = 15 });
bottomTopLinkContainer.Clear(); bottomTopLinkContainer.Clear();
@ -113,7 +113,7 @@ namespace osu.Game.Overlays.Profile.Header
bottomLinkContainer.AddIcon(icon, text => bottomLinkContainer.AddIcon(icon, text =>
{ {
text.TextSize = 10; text.Font = text.Font.With(size: 10);
text.Colour = communityUserGrayGreenLighter; text.Colour = communityUserGrayGreenLighter;
}); });
if (link != null) if (link != null)

3
osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
View File

@ -213,8 +213,7 @@ namespace osu.Game.Overlays.Profile.Header
}, },
rankCount = new OsuSpriteText rankCount = new OsuSpriteText
{ {
Font = "Exo2.0-Bold", Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
TextSize = 12,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre Origin = Anchor.TopCentre
} }

12
osu.Game/Overlays/Profile/Header/RankGraph.cs
View File

@ -43,8 +43,7 @@ namespace osu.Game.Overlays.Profile.Header
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Text = "No recent plays", Text = "No recent plays",
TextSize = 12, Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular)
Font = @"Exo2.0-Regular",
}, },
graph = new RankChartLineGraph graph = new RankChartLineGraph
{ {
@ -227,14 +226,12 @@ namespace osu.Game.Overlays.Profile.Header
{ {
new OsuSpriteText new OsuSpriteText
{ {
Font = "Exo2.0-Bold", Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
TextSize = 12,
Text = "Global Ranking " Text = "Global Ranking "
}, },
globalRankingText = new OsuSpriteText globalRankingText = new OsuSpriteText
{ {
Font = "Exo2.0-Regular", Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
TextSize = 12,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
} }
@ -242,8 +239,7 @@ namespace osu.Game.Overlays.Profile.Header
}, },
timeText = new OsuSpriteText timeText = new OsuSpriteText
{ {
TextSize = 12, Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
Font = "Exo2.0-Regular"
} }
} }
} }

15
osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
View File

@ -75,8 +75,7 @@ namespace osu.Game.Overlays.Profile.Header
{ {
usernameText = new OsuSpriteText usernameText = new OsuSpriteText
{ {
Font = "Exo2.0-Regular", Font = OsuFont.GetFont(size: 24, weight: FontWeight.Regular)
TextSize = 24
}, },
openUserExternally = new ExternalLinkButton openUserExternally = new ExternalLinkButton
{ {
@ -96,8 +95,7 @@ namespace osu.Game.Overlays.Profile.Header
{ {
titleText = new OsuSpriteText titleText = new OsuSpriteText
{ {
TextSize = 18, Font = OsuFont.GetFont(size: 18, weight: FontWeight.Regular)
Font = "Exo2.0-Regular"
}, },
supporterTag = new SupporterIcon supporterTag = new SupporterIcon
{ {
@ -123,8 +121,7 @@ namespace osu.Game.Overlays.Profile.Header
}, },
userCountryText = new OsuSpriteText userCountryText = new OsuSpriteText
{ {
Font = "Exo2.0-Regular", Font = OsuFont.GetFont(size: 17.5f, weight: FontWeight.Regular),
TextSize = 17.5f,
Margin = new MarginPadding { Left = 40 }, Margin = new MarginPadding { Left = 40 },
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
@ -185,17 +182,15 @@ namespace osu.Game.Overlays.Profile.Header
{ {
new OsuSpriteText new OsuSpriteText
{ {
TextSize = 15, Font = OsuFont.GetFont(size: 15),
Text = left, Text = left,
Font = "Exo2.0-Medium"
}, },
new OsuSpriteText new OsuSpriteText
{ {
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
TextSize = 15, Font = OsuFont.GetFont(size: 15, weight: FontWeight.Bold),
Text = right, Text = right,
Font = "Exo2.0-Bold"
}, },
}; };
} }

4
osu.Game/Overlays/Profile/ProfileHeader.cs
View File

@ -12,7 +12,6 @@ using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
namespace osu.Game.Overlays.Profile namespace osu.Game.Overlays.Profile
@ -29,9 +28,6 @@ namespace osu.Game.Overlays.Profile
{ {
CenterHeaderContainer centerHeaderContainer; CenterHeaderContainer centerHeaderContainer;
DetailHeaderContainer detailHeaderContainer; DetailHeaderContainer detailHeaderContainer;
Container expandedDetailContainer;
FillFlowContainer hiddenDetailContainer, headerDetailContainer;
SpriteIcon expandButtonIcon;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;