1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 00:02:54 +08:00

Merge branch 'master' into fix-setting-section-clickability

This commit is contained in:
Salman Ahmed 2021-08-21 14:25:28 +03:00 committed by GitHub
commit df5354eba6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5,6 +5,7 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Game.Input.Bindings; using osu.Game.Input.Bindings;
using osu.Game.Screens.OnlinePlay.Match.Components; using osu.Game.Screens.OnlinePlay.Match.Components;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
@ -38,6 +39,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
Textbox.FocusLost = () => expandedFromTextboxFocus.Value = false; Textbox.FocusLost = () => expandedFromTextboxFocus.Value = false;
} }
protected override bool OnHover(HoverEvent e) => true; // use UI mouse cursor.
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();