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

Allow ChatOverlay resize only if it dragged by the tabs area only

Browse Source
This commit is contained in:
EVAST9919 2017-07-21 13:37:22 +03:00
parent d344452e9b
commit 270ab5c987
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,7 @@ namespace osu.Game.Overlays
private readonly ChatTabControl channelTabs;
private readonly Container chatContainer;
private readonly Container tabsArea;
private readonly Box chatBackground;
private readonly Box tabBackground;
@ -144,7 +145,7 @@ namespace osu.Game.Overlays
loading = new LoadingAnimation(),
}
},
new Container
tabsArea = new Container
{
Name = @"tabs area",
RelativeSizeAxes = Axes.X,
@ -191,9 +192,12 @@ namespace osu.Game.Overlays
}
private double startDragChatHeight;
private bool canBeDragged;
protected override bool OnDragStart(InputState state)
{
canBeDragged = tabsArea.IsHovered;
if (!channelTabs.IsHovered)
return base.OnDragStart(state);
@ -203,10 +207,21 @@ namespace osu.Game.Overlays
protected override bool OnDrag(InputState state)
{
Trace.Assert(state.Mouse.PositionMouseDown != null);
if (canBeDragged)
{
Trace.Assert(state.Mouse.PositionMouseDown != null);
chatHeight.Value = startDragChatHeight - (state.Mouse.Position.Y - state.Mouse.PositionMouseDown.Value.Y) / Parent.DrawSize.Y;
return base.OnDrag(state);
chatHeight.Value = startDragChatHeight - (state.Mouse.Position.Y - state.Mouse.PositionMouseDown.Value.Y) / Parent.DrawSize.Y;
return base.OnDrag(state);
}
return true;
}
protected override bool OnDragEnd(InputState state)
{
canBeDragged = false;
return base.OnDragEnd(state);
}
public void APIStateChanged(APIAccess api, APIState state)