h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 15:47:26 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into on-screen-display

Browse Source
This commit is contained in:
Dean Herbert 2017-05-16 18:54:54 +09:00 committed by GitHub
commit 0c7ceea4fd
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Overlays/Chat/ChatTabControl.cs
View File

@ -46,6 +46,7 @@ namespace osu.Game.Overlays.Chat
private Color4 backgroundActive;
private readonly SpriteText text;
private readonly SpriteText textBold;
private readonly Box box;
private readonly Box highlightBox;
@ -77,7 +78,9 @@ namespace osu.Game.Overlays.Chat
box.FadeColour(backgroundActive, transition_length, EasingTypes.OutQuint);
highlightBox.FadeIn(transition_length, EasingTypes.OutQuint);
text.Font = @"Exo2.0-Bold";
text.FadeOut(transition_length, EasingTypes.OutQuint);
textBold.FadeIn(transition_length, EasingTypes.OutQuint);
}
private void fadeInactive()
@ -86,7 +89,9 @@ namespace osu.Game.Overlays.Chat
box.FadeColour(backgroundInactive, transition_length, EasingTypes.OutQuint);
highlightBox.FadeOut(transition_length, EasingTypes.OutQuint);
text.Font = @"Exo2.0-Regular";
text.FadeIn(transition_length, EasingTypes.OutQuint);
textBold.FadeOut(transition_length, EasingTypes.OutQuint);
}
protected override bool OnHover(InputState state)
@ -172,6 +177,16 @@ namespace osu.Game.Overlays.Chat
Text = value.ToString(),
TextSize = 18,
},
textBold = new OsuSpriteText
{
Alpha = 0,
Margin = new MarginPadding(5),
Origin = Anchor.CentreLeft,
Anchor = Anchor.CentreLeft,
Text = value.ToString(),
Font = @"Exo2.0-Bold",
TextSize = 18,
},
}
}
};

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

@ -284,10 +284,21 @@ namespace osu.Game.Overlays
{
if (channel == null) return;
careChannels.Add(channel);
channelTabs.AddItem(channel);
var existing = careChannels.Find(c => c.Id == channel.Id);
// we need to get a good number of messages initially for each channel we care about.
if (existing != null)
{
// if we already have this channel loaded, we don't want to make a second one.
channel = existing;
}
else
{
careChannels.Add(channel);
channelTabs.AddItem(channel);
}
// let's fetch a small number of messages to bring us up-to-date with the backlog.
fetchInitialMessages(channel);
if (CurrentChannel == null)