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

Add settings button, background triangles, proper displaying of Channels

Browse Source
This commit is contained in:
DrabWeb 2017-05-20 19:30:40 -03:00
parent 6a8d745db1
commit 3cc51006cc
2 changed files with 134 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/Chat/ChannelListItem.cs
View File

@ -76,7 +76,7 @@ namespace osu.Game.Overlays.Chat
{
new OsuSpriteText
{
Text = $@"#{channel.Name}",
Text = channel.ToString(),
TextSize = text_size,
Font = @"Exo2.0-Bold",
},
@ -114,7 +114,7 @@ namespace osu.Game.Overlays.Chat
},
new OsuSpriteText
{
Text = @"543145",
Text = @"0",
TextSize = text_size,
Font = @"Exo2.0-SemiBold",
},

145
osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs
View File

@ -1,17 +1,22 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Audio.Track;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input;
using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Chat;
namespace osu.Game.Overlays.Chat
{
@ -20,8 +25,18 @@ namespace osu.Game.Overlays.Chat
public static readonly float WIDTH_PADDING = 170;
private readonly Box bg;
private readonly Triangles triangles;
private readonly Box headerBg;
private readonly SearchTextBox search;
private readonly FillFlowContainer<ChannelSection> sectionsFlow;
public IEnumerable<ChannelSection> Sections
{
set
{
sectionsFlow.Children = value;
}
}
public ChannelSelectionOverlay()
{
@ -38,12 +53,34 @@ namespace osu.Game.Overlays.Chat
Colour = Color4.Black.Opacity(0.25f),
Radius = 5,
},
Children = new[]
Children = new Drawable[]
{
bg = new Box
{
RelativeSizeAxes = Axes.Both,
},
triangles = new Triangles
{
RelativeSizeAxes = Axes.Both,
TriangleScale = 5,
},
},
},
new ScrollContainer
{
RelativeSizeAxes = Axes.Both,
ScrollDraggerVisible = false,
Padding = new MarginPadding { Top = 85 },
Children = new[]
{
sectionsFlow = new FillFlowContainer<ChannelSection>
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Spacing = new Vector2(0f, 20f),
Padding = new MarginPadding { Top = 20, Left = WIDTH_PADDING, Right = WIDTH_PADDING },
},
},
},
new Container
@ -74,23 +111,15 @@ namespace osu.Game.Overlays.Chat
{
RelativeSizeAxes = Axes.X,
PlaceholderText = @"Search",
Exit = Hide,
},
},
},
},
},
new ChannelSection
new SettingsButton
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Padding = new MarginPadding { Left = WIDTH_PADDING, Right = WIDTH_PADDING },
Header = @"GENERAL CHANNELS",
Channels = new[]
{
new Channel { Name = @"announcements", Topic = @"Automated announcement of stuff going on in osu!" },
new Channel { Name = @"osu!", Topic = @"I dunno, the default channel I guess?" },
new Channel { Name = @"lobby", Topic = @"Look for trouble here" },
},
Margin = new MarginPadding { Top = 160 },
},
};
}
@ -99,6 +128,9 @@ namespace osu.Game.Overlays.Chat
private void load(OsuColour colours)
{
bg.Colour = colours.Gray3;
triangles.ColourDark = colours.Gray3;
triangles.ColourLight = OsuColour.FromHex(@"353535");
headerBg.Colour = colours.Gray2.Opacity(0.75f);
}
@ -118,5 +150,92 @@ namespace osu.Game.Overlays.Chat
protected override Color4 BackgroundFocused => Color4.Black.Opacity(0.2f);
protected override Color4 BackgroundUnfocused => Color4.Black.Opacity(0.2f);
}
private class SettingsButton : ClickableContainer
{
private const float width = 60f;
private readonly Box bg;
private readonly Container bgContainer;
private SampleChannel clickSample;
public SettingsButton()
{
Size = new Vector2(width, 50f);
Children = new Drawable[]
{
bgContainer = new Container
{
RelativeSizeAxes = Axes.Both,
Shear = new Vector2(0.2f, 0f),
Masking = true,
MaskingSmoothness = 2,
EdgeEffect = new EdgeEffect
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.2f),
Offset = new Vector2(2, 0),
Radius = 2,
},
Children = new[]
{
bg = new Box
{
RelativeSizeAxes = Axes.Both,
EdgeSmoothness = new Vector2(2f, 0f),
},
},
},
new TextAwesome
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Icon = FontAwesome.fa_osu_gear,
TextSize = 20,
Shadow = true,
UseFullGlyphHeight = false,
},
};
}
[BackgroundDependencyLoader]
private void load(OsuColour colours, AudioManager audio)
{
bg.Colour = colours.Pink;
clickSample = audio.Sample.Get(@"Menu/menuclick");
}
protected override bool OnHover(InputState state)
{
ResizeWidthTo(width + 20f, 500, EasingTypes.OutElastic);
return base.OnHover(state);
}
protected override void OnHoverLost(InputState state)
{
ResizeWidthTo(width, 500, EasingTypes.OutElastic);
}
protected override bool OnClick(InputState state)
{
var flash = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.White.Opacity(0.5f),
};
bgContainer.Add(flash);
flash.Alpha = 1;
flash.FadeOut(500, EasingTypes.OutQuint);
flash.Expire();
clickSample.Play();
return base.OnClick(state);
}
}
}
}