sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into decouple-legacy-score-info

Browse Source
This commit is contained in:
Dan Balasescu
2019-12-04 11:47:27 +09:00
committed by GitHub
parent a225a35f91 5d7c40da6e
commit 19c5848e73
16 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Overlays/MedalSplash/DrawableMedal.cs
View File

@ -16,6 +16,7 @@ using osu.Game.Users;
namespace osu.Game.Overlays.MedalSplash
{
[LongRunningLoad]
public class DrawableMedal : Container, IStateful<DisplayState>
{
private const float scale_when_unlocked = 0.76f;

1
osu.Game/Overlays/Profile/Header/Components/DrawableBadge.cs
View File

@ -12,6 +12,7 @@ using osuTK;
namespace osu.Game.Overlays.Profile.Header.Components
{
[LongRunningLoad]
public class DrawableBadge : CompositeDrawable, IHasTooltip
{
public static readonly Vector2 DRAWABLE_BADGE_SIZE = new Vector2(86, 40);

35
osu.Game/Overlays/Profile/Sections/DrawableProfileRow.cs
View File

@ -19,8 +19,8 @@ namespace osu.Game.Overlays.Profile.Sections
private const int fade_duration = 200;
private Box underscoreLine;
private readonly Box coloredBackground;
private readonly Container background;
private Box coloredBackground;
private Container background;
/// <summary>
/// A visual element displayed to the left of <see cref="LeftFlowContainer"/> content.
@ -36,6 +36,19 @@ namespace osu.Game.Overlays.Profile.Sections
{
RelativeSizeAxes = Axes.X;
Height = 60;
Content = new Container
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Width = 0.97f,
};
}
[BackgroundDependencyLoader(true)]
private void load(OsuColour colour)
{
InternalChildren = new Drawable[]
{
background = new Container
@ -53,21 +66,7 @@ namespace osu.Game.Overlays.Profile.Sections
},
Child = coloredBackground = new Box { RelativeSizeAxes = Axes.Both }
},
Content = new Container
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Width = 0.97f,
},
};
}
[BackgroundDependencyLoader(true)]
private void load(OsuColour colour)
{
AddRange(new Drawable[]
{
Content,
underscoreLine = new Box
{
Anchor = Anchor.BottomCentre,
@ -101,7 +100,7 @@ namespace osu.Game.Overlays.Profile.Sections
Origin = Anchor.CentreRight,
Direction = FillDirection.Vertical,
},
});
};
coloredBackground.Colour = underscoreLine.Colour = colour.Gray4;
}

7
osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
View File

@ -66,11 +66,14 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
};
case RecentActivityType.Achievement:
return new MedalIcon(activity.Achievement.Slug)
return new DelayedLoadWrapper(new MedalIcon(activity.Achievement.Slug)
{
RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fit,
})
{
RelativeSizeAxes = Axes.Y,
Width = 60,
FillMode = FillMode.Fit,
};
default:

1
osu.Game/Overlays/Profile/Sections/Recent/MedalIcon.cs
View File

@ -9,6 +9,7 @@ using osu.Framework.Graphics.Textures;
namespace osu.Game.Overlays.Profile.Sections.Recent
{
[LongRunningLoad]
public class MedalIcon : Container
{
private readonly string slug;