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

Fix the channel list appearing behind the tab bar

Browse Source
This commit is contained in:
DrabWeb
2017-06-02 01:00:09 -03:00
parent 62ada0afcb
commit 90dabe01f4
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ namespace osu.Game.Overlays
private Bindable<double> chatHeight; private Bindable<double> chatHeight;
private readonly Container channelSelectionContainer;
private readonly ChannelSelectionOverlay channelSelection; private readonly ChannelSelectionOverlay channelSelection;
protected override bool InternalContains(Vector2 screenSpacePos) => chatContainer.Contains(screenSpacePos) || channelSelection.Contains(screenSpacePos); protected override bool InternalContains(Vector2 screenSpacePos) => chatContainer.Contains(screenSpacePos) || channelSelection.Contains(screenSpacePos);
@ -70,12 +71,18 @@ namespace osu.Game.Overlays
Children = new Drawable[] Children = new Drawable[]
{ {
channelSelection = new ChannelSelectionOverlay channelSelectionContainer = new Container
{ {
Anchor = Anchor.TopLeft,
Origin = Anchor.TopLeft,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Height = 1f - DEFAULT_HEIGHT, Height = 1f - DEFAULT_HEIGHT,
Masking = true,
Children = new[]
{
channelSelection = new ChannelSelectionOverlay
{
RelativeSizeAxes = Axes.Both,
},
},
}, },
chatContainer = new Container chatContainer = new Container
{ {
@ -165,7 +172,7 @@ namespace osu.Game.Overlays
if (1f - chatHeight.Value < channel_selection_min_height) if (1f - chatHeight.Value < channel_selection_min_height)
{ {
chatContainer.ResizeHeightTo(1f - channel_selection_min_height, 800, EasingTypes.OutQuint); chatContainer.ResizeHeightTo(1f - channel_selection_min_height, 800, EasingTypes.OutQuint);
channelSelection.ResizeHeightTo(channel_selection_min_height, 800, EasingTypes.OutQuint); channelSelectionContainer.ResizeHeightTo(channel_selection_min_height, 800, EasingTypes.OutQuint);
channelSelection.Show(); channelSelection.Show();
chatHeight.Value = 1f - channel_selection_min_height; chatHeight.Value = 1f - channel_selection_min_height;
} }
@ -248,7 +255,7 @@ namespace osu.Game.Overlays
chatHeight.ValueChanged += h => chatHeight.ValueChanged += h =>
{ {
chatContainer.Height = (float)h; chatContainer.Height = (float)h;
channelSelection.Height = 1f - (float)h; channelSelectionContainer.Height = 1f - (float)h;
tabBackground.FadeTo(h == 1 ? 1 : 0.8f, 200); tabBackground.FadeTo(h == 1 ? 1 : 0.8f, 200);
}; };
chatHeight.TriggerChange(); chatHeight.TriggerChange();