sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use Channels in ChannelListItems, ChannelSection, fix ChannelListItem being misaligned

Browse Source
This commit is contained in:
DrabWeb
2017-05-20 18:29:57 -03:00
parent 31890a1e01
commit 6a8d745db1
4 changed files with 77 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,11 +8,13 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
namespace osu.Game.Overlays.Chat
{
public class ChannelListItem : ClickableContainer
{
private const float width_padding = 5;
private const float channel_width = 150;
private const float topic_width = 380;
private const float text_size = 15;
@ -37,7 +39,7 @@ namespace osu.Game.Overlays.Chat
}
}
public ChannelListItem()
public ChannelListItem(Channel channel)
{
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
@ -49,8 +51,6 @@ namespace osu.Game.Overlays.Chat
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(5f, 0f),
Padding = new MarginPadding { Left = ChannelSelectionOverlay.WIDTH_PADDING, Right = ChannelSelectionOverlay.WIDTH_PADDING },
Children = new Drawable[]
{
new Container
@ -76,7 +76,7 @@ namespace osu.Game.Overlays.Chat
{
new OsuSpriteText
{
Text = @"#osu!",
Text = $@"#{channel.Name}",
TextSize = text_size,
Font = @"Exo2.0-Bold",
},
@ -86,11 +86,12 @@ namespace osu.Game.Overlays.Chat
{
Width = topic_width,
AutoSizeAxes = Axes.Y,
Margin = new MarginPadding { Left = width_padding },
Children = new[]
{
topic = new OsuSpriteText
{
Text = @"I dunno, the default channel I guess?",
Text = channel.Topic,
TextSize = text_size,
Font = @"Exo2.0-SemiBold",
Alpha = 0.8f,
@ -101,6 +102,7 @@ namespace osu.Game.Overlays.Chat
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Margin = new MarginPadding { Left = width_padding },
Spacing = new Vector2(3f, 0f),
Children = new Drawable[]
{
@ -133,7 +135,7 @@ namespace osu.Game.Overlays.Chat
}
private void updateColour()
{
{
joinedCheckmark.FadeTo(joined ? 1f : 0f, transition_duration);
topic.FadeTo(joined ? 0.8f : 1f, transition_duration);
topic.FadeColour(joined ? Color4.White : topicColour ?? Color4.White, transition_duration);