1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 09:42:54 +08:00

Merge pull request #14703 from gagahpangeran/supporter-bg

Fix supporter promo background colour
This commit is contained in:
Dean Herbert 2021-09-10 14:11:01 +09:00 committed by GitHub
commit 63116a8889
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -26,9 +26,6 @@ namespace osu.Game.Overlays.Changelog
private const float image_container_width = 164; private const float image_container_width = 164;
private const float heart_size = 75; private const float heart_size = 75;
private readonly FillFlowContainer textContainer;
private readonly Container imageContainer;
public ChangelogSupporterPromo() public ChangelogSupporterPromo()
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
@ -38,6 +35,12 @@ namespace osu.Game.Overlays.Changelog
Vertical = 20, Vertical = 20,
Horizontal = 50, Horizontal = 50,
}; };
}
[BackgroundDependencyLoader]
private void load(OsuColour colour, TextureStore textures, OverlayColourProvider colourProvider)
{
SupporterPromoLinkFlowContainer supportLinkText;
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
@ -59,7 +62,7 @@ namespace osu.Game.Overlays.Changelog
new Box new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = Color4.Black.Opacity(0.3f), Colour = colourProvider.Background5,
}, },
new Container new Container
{ {
@ -68,7 +71,7 @@ namespace osu.Game.Overlays.Changelog
Padding = new MarginPadding { Horizontal = 75 }, Padding = new MarginPadding { Horizontal = 75 },
Children = new Drawable[] Children = new Drawable[]
{ {
textContainer = new FillFlowContainer new FillFlowContainer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
@ -76,26 +79,7 @@ namespace osu.Game.Overlays.Changelog
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Padding = new MarginPadding { Right = 50 + image_container_width }, Padding = new MarginPadding { Right = 50 + image_container_width },
}, Children = new Drawable[]
imageContainer = new Container
{
RelativeSizeAxes = Axes.Y,
Width = image_container_width,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
}
}
},
}
},
};
}
[BackgroundDependencyLoader]
private void load(OsuColour colour, TextureStore textures)
{
SupporterPromoLinkFlowContainer supportLinkText;
textContainer.Children = new Drawable[]
{ {
new OsuSpriteText new OsuSpriteText
{ {
@ -123,13 +107,15 @@ namespace osu.Game.Overlays.Changelog
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
} }
}; },
},
supportLinkText.AddText("Support further development of osu! and "); new Container
supportLinkText.AddLink("become an osu!supporter", @"https://osu.ppy.sh/home/support", t => t.Font = t.Font.With(weight: FontWeight.Bold)); {
supportLinkText.AddText(" today!"); RelativeSizeAxes = Axes.Y,
Width = image_container_width,
imageContainer.Children = new Drawable[] Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Children = new Drawable[]
{ {
new Sprite new Sprite
{ {
@ -160,7 +146,17 @@ namespace osu.Game.Overlays.Changelog
Texture = textures.Get(@"Online/supporter-heart"), Texture = textures.Get(@"Online/supporter-heart"),
}, },
}, },
}
}
}
},
}
},
}; };
supportLinkText.AddText("Support further development of osu! and ");
supportLinkText.AddLink("become an osu!supporter", @"https://osu.ppy.sh/home/support", t => t.Font = t.Font.With(weight: FontWeight.Bold));
supportLinkText.AddText(" today!");
} }
private class SupporterPromoLinkFlowContainer : LinkFlowContainer private class SupporterPromoLinkFlowContainer : LinkFlowContainer