h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 03:25:11 +08:00
Code Issues Releases Wiki Activity

Use new icon in chat overlay

Browse Source
This commit is contained in:
Joehu 2020-09-17 14:56:08 -07:00
parent 0dceef8cd7
commit 83d23c9547
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Overlays/ChatOverlay.cs
View File

@ -23,6 +23,7 @@ using osu.Game.Overlays.Chat.Selection;
using osu.Game.Overlays.Chat.Tabs; using osu.Game.Overlays.Chat.Tabs;
using osuTK.Input; using osuTK.Input;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
namespace osu.Game.Overlays namespace osu.Game.Overlays
{ {
@ -78,7 +79,7 @@ namespace osu.Game.Overlays
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config, OsuColour colours) private void load(OsuConfigManager config, OsuColour colours, TextureStore textures)
{ {
const float padding = 5; const float padding = 5;
@ -163,13 +164,13 @@ namespace osu.Game.Overlays
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = Color4.Black, Colour = Color4.Black,
}, },
new SpriteIcon new Sprite
{ {
Icon = FontAwesome.Solid.Comments, Texture = textures.Get(IconTexture),
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Size = new Vector2(20), Size = new Vector2(OverlayTitle.ICON_SIZE),
Margin = new MarginPadding(10), Margin = new MarginPadding { Left = 10 },
}, },
ChannelTabControl = CreateChannelTabControl().With(d => ChannelTabControl = CreateChannelTabControl().With(d =>
{ {

4
osu.Game/Overlays/OverlayTitle.cs
View File

@ -14,6 +14,8 @@ namespace osu.Game.Overlays
{ {
public abstract class OverlayTitle : CompositeDrawable, INamedOverlayComponent public abstract class OverlayTitle : CompositeDrawable, INamedOverlayComponent
{ {
public const float ICON_SIZE = 30;
private readonly OsuSpriteText titleText; private readonly OsuSpriteText titleText;
private readonly Container icon; private readonly Container icon;
@ -51,7 +53,7 @@ namespace osu.Game.Overlays
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Margin = new MarginPadding { Horizontal = 5 }, // compensates for osu-web sprites having around 5px of whitespace on each side Margin = new MarginPadding { Horizontal = 5 }, // compensates for osu-web sprites having around 5px of whitespace on each side
Size = new Vector2(30) Size = new Vector2(ICON_SIZE)
}, },
titleText = new OsuSpriteText titleText = new OsuSpriteText
{ {