sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into Private_Messages

Browse Source
This commit is contained in:
Dean Herbert
2018-11-12 20:41:10 +09:00
parent 3c8c7a0459 27a794f1d5
commit 4b1282235a
410 changed files with 6673 additions and 3295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
View File

@ -10,7 +10,7 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.States;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Sprites;
@ -157,10 +157,10 @@ namespace osu.Game.Overlays.Chat.Selection
headerBg.Colour = colours.Gray2.Opacity(0.75f);
}
protected override void OnFocus(InputState state)
protected override void OnFocus(FocusEvent e)
{
GetContainingInputManager().ChangeFocus(search);
base.OnFocus(state);
base.OnFocus(e);
}
protected override void PopIn()