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

Remove custom action from DrawableRoom

Browse Source
This commit is contained in:
smoogipoo
2018-12-07 14:28:43 +09:00
parent c02150a19b
commit d68b4bb8e7
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Screens/Multi/Components/DrawableRoom.cs
View File

@ -10,7 +10,6 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables; using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics; using osu.Game.Graphics;
@ -36,8 +35,6 @@ namespace osu.Game.Screens.Multi.Components
public event Action<SelectionState> StateChanged; public event Action<SelectionState> StateChanged;
public Action SelectionRequested;
private readonly Box selectionBox; private readonly Box selectionBox;
private readonly Bindable<string> nameBind = new Bindable<string>(); private readonly Bindable<string> nameBind = new Bindable<string>();
@ -244,11 +241,5 @@ namespace osu.Game.Screens.Multi.Components
base.LoadComplete(); base.LoadComplete();
this.FadeInFromZero(transition_duration); this.FadeInFromZero(transition_duration);
} }
protected override bool OnClick(ClickEvent e)
{
SelectionRequested?.Invoke();
return true;
}
} }
} }

2
osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs
View File

@ -117,7 +117,7 @@ namespace osu.Game.Screens.Multi.Screens.Lounge
{ {
var drawableRoom = new DrawableRoom(room); var drawableRoom = new DrawableRoom(room);
drawableRoom.SelectionRequested = () => selectionRequested(drawableRoom); drawableRoom.Action = () => selectionRequested(drawableRoom);
RoomsContainer.Add(drawableRoom); RoomsContainer.Add(drawableRoom);