sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Second design update pass.

Browse Source
This commit is contained in:
Dean Herbert
2017-05-12 15:32:52 +09:00
parent 6ea65009c4
commit dbf60d24bf
4 changed files with 213 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,11 +43,13 @@ namespace osu.Game.Overlays
public const float DEFAULT_HEIGHT = 0.4f;
private const float tab_area_height = 50;
public const float TAB_AREA_HEIGHT = 50;
private GetMessagesRequest fetchReq;
private readonly OsuTabControl<Channel> channelTabs;
private readonly ChatTabControl channelTabs;
private readonly Box chatBackground;
private Bindable<double> chatHeight;
@ -63,36 +65,16 @@ namespace osu.Game.Overlays
Children = new Drawable[]
{
new Container
{
Name = @"tabs area",
RelativeSizeAxes = Axes.X,
Height = tab_area_height,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
Alpha = 0.8f,
},
channelTabs = new OsuTabControl<Channel>
{
RelativeSizeAxes = Axes.Both,
},
}
},
new Container
{
Name = @"chat area",
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = tab_area_height },
Padding = new MarginPadding { Top = TAB_AREA_HEIGHT },
Children = new Drawable[]
{
new Box
chatBackground = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = OsuColour.FromHex(@"17292e"),
},
currentChannelContainer = new Container
{
@ -131,6 +113,25 @@ namespace osu.Game.Overlays
}
}
},
new Container
{
Name = @"tabs area",
RelativeSizeAxes = Axes.X,
Height = TAB_AREA_HEIGHT,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
Alpha = 0.8f,
},
channelTabs = new ChatTabControl
{
RelativeSizeAxes = Axes.Both,
},
}
},
};
channelTabs.Current.ValueChanged += newChannel => CurrentChannel = newChannel;
@ -189,7 +190,7 @@ namespace osu.Game.Overlays
}
[BackgroundDependencyLoader]
private void load(APIAccess api, OsuConfigManager config)
private void load(APIAccess api, OsuConfigManager config, OsuColour colours)
{
this.api = api;
api.Register(this);
@ -197,6 +198,8 @@ namespace osu.Game.Overlays
chatHeight = config.GetBindable<double>(OsuConfig.ChatDisplayHeight);
chatHeight.ValueChanged += h => Height = (float)h;
chatHeight.TriggerChange();
chatBackground.Colour = colours.ChatBlue;
}
private long? lastMessageId;