h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 13:23:22 +08:00
Code Issues Releases Wiki Activity

Fix post-merge errors

Browse Source
This commit is contained in:
smoogipoo 2019-03-06 16:09:21 +09:00
parent ee1f9d4981
commit 3c999d64d4
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Overlays/Profile/Header/CenterHeaderContainer.cs
View File

@ -3,7 +3,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Configuration; using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -108,8 +108,7 @@ namespace osu.Game.Overlays.Profile.Header
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
TextSize = 16, Font = OsuFont.GetFont(weight: FontWeight.Bold)
Font = "Exo2.0-Bold"
} }
} }
} }
@ -182,10 +181,9 @@ namespace osu.Game.Overlays.Profile.Header
}, },
levelBadgeText = new OsuSpriteText levelBadgeText = new OsuSpriteText
{ {
TextSize = 20,
Font = "Exo2.0-Medium",
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium)
} }
} }
}, },
@ -215,8 +213,7 @@ namespace osu.Game.Overlays.Profile.Header
{ {
Anchor = Anchor.BottomRight, Anchor = Anchor.BottomRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Font = "Exo2.0-Bold", Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold)
TextSize = 12,
} }
} }
}, },
@ -248,9 +245,12 @@ namespace osu.Game.Overlays.Profile.Header
} }
}; };
DetailsVisible.ValueChanged += newValue => expandButtonIcon.Icon = newValue ? FontAwesome.fa_chevron_down : FontAwesome.fa_chevron_up; DetailsVisible.ValueChanged += visible =>
DetailsVisible.ValueChanged += newValue => hiddenDetailContainer.Alpha = newValue ? 1 : 0; {
DetailsVisible.ValueChanged += newValue => expandedDetailContainer.Alpha = newValue ? 0 : 1; expandButtonIcon.Icon = visible.NewValue ? FontAwesome.fa_chevron_down : FontAwesome.fa_chevron_up;
hiddenDetailContainer.Alpha = visible.NewValue ? 1 : 0;
expandedDetailContainer.Alpha = visible.NewValue ? 0 : 1;
};
} }
private void updateDisplay() private void updateDisplay()

16
osu.Game/Overlays/Profile/Header/ProfileHeaderTabControl.cs
View File

@ -5,6 +5,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osuTK; using osuTK;
@ -36,7 +37,7 @@ namespace osu.Game.Overlays.Profile.Header
} }
} }
public MarginPadding Padding public new MarginPadding Padding
{ {
get => TabContainer.Padding; get => TabContainer.Padding;
set => TabContainer.Padding = value; set => TabContainer.Padding = value;
@ -78,7 +79,7 @@ namespace osu.Game.Overlays.Profile.Header
accentColour = value; accentColour = value;
bar.Colour = value; bar.Colour = value;
if (!Active) text.Colour = value; if (!Active.Value) text.Colour = value;
} }
} }
@ -96,8 +97,7 @@ namespace osu.Game.Overlays.Profile.Header
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Text = value, Text = value,
TextSize = 14, Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold)
Font = "Exo2.0-Bold",
}, },
bar = new Circle bar = new Circle
{ {
@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Profile.Header
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
if (!Active) if (!Active.Value)
onActivated(true); onActivated(true);
return base.OnHover(e); return base.OnHover(e);
} }
@ -121,7 +121,7 @@ namespace osu.Game.Overlays.Profile.Header
{ {
base.OnHoverLost(e); base.OnHoverLost(e);
if (!Active) if (!Active.Value)
OnDeactivated(); OnDeactivated();
} }
@ -134,7 +134,7 @@ namespace osu.Game.Overlays.Profile.Header
{ {
text.FadeColour(AccentColour, 120, Easing.InQuad); text.FadeColour(AccentColour, 120, Easing.InQuad);
bar.ResizeHeightTo(0, 120, Easing.InQuad); bar.ResizeHeightTo(0, 120, Easing.InQuad);
text.Font = "Exo2.0-Medium"; text.Font = text.Font.With(Typeface.Exo, weight: FontWeight.Medium);
} }
private void onActivated(bool fake = false) private void onActivated(bool fake = false)
@ -142,7 +142,7 @@ namespace osu.Game.Overlays.Profile.Header
text.FadeColour(Color4.White, 120, Easing.InQuad); text.FadeColour(Color4.White, 120, Easing.InQuad);
bar.ResizeHeightTo(7.5f, 120, Easing.InQuad); bar.ResizeHeightTo(7.5f, 120, Easing.InQuad);
if (!fake) if (!fake)
text.Font = "Exo2.0-Bold"; text.Font = text.Font.With(Typeface.Exo, weight: FontWeight.Bold);
} }
} }
} }

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

@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osuTK.Graphics; using osuTK.Graphics;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -15,6 +14,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Overlays.Profile.Header; using osu.Game.Overlays.Profile.Header;
using osu.Game.Users; using osu.Game.Users;
using osu.Framework.Bindables;
namespace osu.Game.Overlays.Profile namespace osu.Game.Overlays.Profile
{ {
@ -145,7 +145,7 @@ namespace osu.Game.Overlays.Profile
infoTabControl.AddItem("Modding"); infoTabControl.AddItem("Modding");
centerHeaderContainer.DetailsVisible.BindTo(DetailsVisible); centerHeaderContainer.DetailsVisible.BindTo(DetailsVisible);
DetailsVisible.ValueChanged += newValue => detailHeaderContainer.Alpha = newValue ? 0 : 1; DetailsVisible.ValueChanged += visible => detailHeaderContainer.Alpha = visible.NewValue ? 0 : 1;
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -224,13 +224,11 @@ namespace osu.Game.Overlays.Profile
}, },
title = new OsuSpriteText title = new OsuSpriteText
{ {
Font = "Exo2.0-Bold", Font = OsuFont.GetFont(size: big ? 14 : 12, weight: FontWeight.Bold)
TextSize = big ? 14 : 12,
}, },
content = new OsuSpriteText content = new OsuSpriteText
{ {
Font = "Exo2.0-Light", Font = OsuFont.GetFont(size: big ? 40 : 18, weight: FontWeight.Light)
TextSize = big ? 40 : 18,
}, },
new Container //Add a minimum size to the FillFlowContainer new Container //Add a minimum size to the FillFlowContainer
{ {