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

Fix post-merge issues

Browse Source
This commit is contained in:
smoogipoo 2018-11-26 16:29:56 +09:00
parent dcf740e5d3
commit dea387c31e
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/TestCaseRoomSettings.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Graphics;
using osu.Framework.Testing.Input; using osu.Framework.Testing.Input;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi.Screens.Match.Settings; using osu.Game.Screens.Multi.Screens.Match.Settings;
using OpenTK.Input; using osuTK.Input;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {

12
osu.Game/Screens/Multi/Screens/Match/Settings/GameTypePicker.cs
View File

@ -6,11 +6,11 @@ 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.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.States; using osu.Framework.Input.Events;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi.Components; using osu.Game.Screens.Multi.Components;
using OpenTK; using osuTK;
namespace osu.Game.Screens.Multi.Screens.Match.Settings namespace osu.Game.Screens.Multi.Screens.Match.Settings
{ {
@ -84,16 +84,16 @@ namespace osu.Game.Screens.Multi.Screens.Match.Settings
selection.Colour = colours.Yellow; selection.Colour = colours.Yellow;
} }
protected override bool OnHover(InputState state) protected override bool OnHover(HoverEvent e)
{ {
hover.FadeTo(0.05f, transition_duration, Easing.OutQuint); hover.FadeTo(0.05f, transition_duration, Easing.OutQuint);
return base.OnHover(state); return base.OnHover(e);
} }
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(HoverLostEvent e)
{ {
hover.FadeOut(transition_duration, Easing.OutQuint); hover.FadeOut(transition_duration, Easing.OutQuint);
base.OnHoverLost(state); base.OnHoverLost(e);
} }
protected override void OnActivated() protected override void OnActivated()

14
osu.Game/Screens/Multi/Screens/Match/Settings/RoomAvailabilityPicker.cs
View File

@ -6,12 +6,12 @@ using osu.Framework.Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.States; using osu.Framework.Input.Events;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
using OpenTK; using osuTK;
using OpenTK.Graphics; using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Screens.Match.Settings namespace osu.Game.Screens.Multi.Screens.Match.Settings
{ {
@ -79,16 +79,16 @@ namespace osu.Game.Screens.Multi.Screens.Match.Settings
selection.Colour = colours.GreenLight; selection.Colour = colours.GreenLight;
} }
protected override bool OnHover(InputState state) protected override bool OnHover(HoverEvent e)
{ {
hover.FadeTo(0.05f, transition_duration, Easing.OutQuint); hover.FadeTo(0.05f, transition_duration, Easing.OutQuint);
return base.OnHover(state); return base.OnHover(e);
} }
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(HoverLostEvent e)
{ {
hover.FadeOut(transition_duration, Easing.OutQuint); hover.FadeOut(transition_duration, Easing.OutQuint);
base.OnHoverLost(state); base.OnHoverLost(e);
} }
protected override void OnActivated() protected override void OnActivated()

6
osu.Game/Screens/Multi/Screens/Match/Settings/RoomSettingsOverlay.cs
View File

@ -11,8 +11,8 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
using osu.Game.Overlays.SearchableList; using osu.Game.Overlays.SearchableList;
using OpenTK; using osuTK;
using OpenTK.Graphics; using osuTK.Graphics;
namespace osu.Game.Screens.Multi.Screens.Match.Settings namespace osu.Game.Screens.Multi.Screens.Match.Settings
{ {
@ -26,7 +26,6 @@ namespace osu.Game.Screens.Multi.Screens.Match.Settings
private readonly Bindable<GameType> typeBind = new Bindable<GameType>(); private readonly Bindable<GameType> typeBind = new Bindable<GameType>();
private readonly Bindable<int?> maxParticipantsBind = new Bindable<int?>(); private readonly Bindable<int?> maxParticipantsBind = new Bindable<int?>();
private readonly Room room;
private readonly Container content; private readonly Container content;
private readonly OsuSpriteText typeLabel; private readonly OsuSpriteText typeLabel;
@ -37,7 +36,6 @@ namespace osu.Game.Screens.Multi.Screens.Match.Settings
public RoomSettingsOverlay(Room room) public RoomSettingsOverlay(Room room)
{ {
this.room = room;
Masking = true; Masking = true;
Child = content = new Container Child = content = new Container