Apply input method signature refactorings

This commit is contained in:
smoogipoo
2020-01-20 18:17:21 +09:00
parent fab8f4661a
commit bfb056c612
36 changed files with 95 additions and 127 deletions

View File

@ -54,10 +54,10 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
return true; return true;
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
EndPlacement(); EndPlacement();
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
public override void UpdatePosition(Vector2 screenSpacePosition) public override void UpdatePosition(Vector2 screenSpacePosition)

View File

@ -55,14 +55,12 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnDrag(DragEvent e) protected override void OnDrag(DragEvent e)
{ {
var result = base.OnDrag(e); base.OnDrag(e);
ScreenSpaceDragPosition = e.ScreenSpaceMousePosition; ScreenSpaceDragPosition = e.ScreenSpaceMousePosition;
DragPosition = DrawableObject.ToLocalSpace(e.ScreenSpaceMousePosition); DragPosition = DrawableObject.ToLocalSpace(e.ScreenSpaceMousePosition);
return result;
} }
public override void Show() public override void Show()

View File

@ -135,13 +135,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
return false; return false;
} }
protected override bool OnMouseUp(MouseUpEvent e) => RequestSelection != null;
protected override bool OnClick(ClickEvent e) => RequestSelection != null; protected override bool OnClick(ClickEvent e) => RequestSelection != null;
protected override bool OnDragStart(DragStartEvent e) => e.Button == MouseButton.Left; protected override bool OnDragStart(DragStartEvent e) => e.Button == MouseButton.Left;
protected override bool OnDrag(DragEvent e) protected override void OnDrag(DragEvent e)
{ {
if (ControlPoint == slider.Path.ControlPoints[0]) if (ControlPoint == slider.Path.ControlPoints[0])
{ {
@ -158,12 +156,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
} }
else else
ControlPoint.Position.Value += e.Delta; ControlPoint.Position.Value += e.Delta;
return true;
} }
protected override bool OnDragEnd(DragEndEvent e) => true;
/// <summary> /// <summary>
/// Updates the state of the circular control point marker. /// Updates the state of the circular control point marker.
/// </summary> /// </summary>

View File

@ -106,11 +106,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
return true; return true;
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
if (state == PlacementState.Body && e.Button == MouseButton.Right) if (state == PlacementState.Body && e.Button == MouseButton.Right)
endCurve(); endCurve();
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
protected override bool OnDoubleClick(DoubleClickEvent e) protected override bool OnDoubleClick(DoubleClickEvent e)

View File

@ -90,19 +90,16 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
protected override bool OnDragStart(DragStartEvent e) => placementControlPointIndex != null; protected override bool OnDragStart(DragStartEvent e) => placementControlPointIndex != null;
protected override bool OnDrag(DragEvent e) protected override void OnDrag(DragEvent e)
{ {
Debug.Assert(placementControlPointIndex != null); Debug.Assert(placementControlPointIndex != null);
HitObject.Path.ControlPoints[placementControlPointIndex.Value].Position.Value = e.MousePosition - HitObject.Position; HitObject.Path.ControlPoints[placementControlPointIndex.Value].Position.Value = e.MousePosition - HitObject.Position;
return true;
} }
protected override bool OnDragEnd(DragEndEvent e) protected override void OnDragEnd(DragEndEvent e)
{ {
placementControlPointIndex = null; placementControlPointIndex = null;
return true;
} }
private BindableList<PathControlPoint> controlPoints => HitObject.Path.ControlPoints; private BindableList<PathControlPoint> controlPoints => HitObject.Path.ControlPoints;

View File

@ -289,16 +289,15 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
return true; return true;
} }
protected override bool OnDrag(DragEvent e) protected override void OnDrag(DragEvent e)
{ {
if (base.OnDrag(e)) return true; base.OnDrag(e);
Selected = true; Selected = true;
this.MoveToOffset(e.Delta); this.MoveToOffset(e.Delta);
var pos = Position; var pos = Position;
Match.Position.Value = new Point((int)pos.X, (int)pos.Y); Match.Position.Value = new Point((int)pos.X, (int)pos.Y);
return true;
} }
public void Remove() public void Remove()

View File

@ -22,10 +22,9 @@ namespace osu.Game.Tournament.Screens.Ladder
protected override bool ComputeIsMaskedAway(RectangleF maskingBounds) => false; protected override bool ComputeIsMaskedAway(RectangleF maskingBounds) => false;
protected override bool OnDrag(DragEvent e) protected override void OnDrag(DragEvent e)
{ {
this.MoveTo(target += e.Delta, 1000, Easing.OutQuint); this.MoveTo(target += e.Delta, 1000, Easing.OutQuint);
return true;
} }
private const float min_scale = 0.6f; private const float min_scale = 0.6f;

View File

@ -76,12 +76,12 @@ namespace osu.Game.Graphics.Containers
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
if (closeOnMouseUp && !base.ReceivePositionalInputAt(e.ScreenSpaceMousePosition)) if (closeOnMouseUp && !base.ReceivePositionalInputAt(e.ScreenSpaceMousePosition))
Hide(); Hide();
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
public virtual bool OnPressed(GlobalAction action) public virtual bool OnPressed(GlobalAction action)

View File

@ -50,15 +50,15 @@ namespace osu.Game.Graphics.Containers
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnDrag(DragEvent e) protected override void OnDrag(DragEvent e)
{ {
if (rightMouseDragging) if (rightMouseDragging)
{ {
scrollFromMouseEvent(e); scrollFromMouseEvent(e);
return true; return;
} }
return base.OnDrag(e); base.OnDrag(e);
} }
protected override bool OnDragStart(DragStartEvent e) protected override bool OnDragStart(DragStartEvent e)
@ -72,15 +72,15 @@ namespace osu.Game.Graphics.Containers
return base.OnDragStart(e); return base.OnDragStart(e);
} }
protected override bool OnDragEnd(DragEndEvent e) protected override void OnDragEnd(DragEndEvent e)
{ {
if (rightMouseDragging) if (rightMouseDragging)
{ {
rightMouseDragging = false; rightMouseDragging = false;
return true; return;
} }
return base.OnDragEnd(e); base.OnDragEnd(e);
} }
protected override bool OnScroll(ScrollEvent e) protected override bool OnScroll(ScrollEvent e)
@ -162,13 +162,13 @@ namespace osu.Game.Graphics.Containers
return true; return true;
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
if (e.Button != MouseButton.Left) return false; if (e.Button != MouseButton.Left) return;
box.FadeColour(Color4.White, 100); box.FadeColour(Color4.White, 100);
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
} }
} }

View File

@ -92,7 +92,7 @@ namespace osu.Game.Graphics.Cursor
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
if (!e.IsPressed(MouseButton.Left) && !e.IsPressed(MouseButton.Right)) if (!e.IsPressed(MouseButton.Left) && !e.IsPressed(MouseButton.Right))
{ {
@ -107,7 +107,7 @@ namespace osu.Game.Graphics.Cursor
dragRotationState = DragRotationState.NotDragging; dragRotationState = DragRotationState.NotDragging;
} }
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
protected override void PopIn() protected override void PopIn()

View File

@ -232,11 +232,11 @@ namespace osu.Game.Graphics.UserInterface
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
if (Selected.Value) if (Selected.Value)
colourContainer.ResizeWidthTo(hover_width, click_duration, Easing.In); colourContainer.ResizeWidthTo(hover_width, click_duration, Easing.In);
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)

View File

@ -107,10 +107,10 @@ namespace osu.Game.Graphics.UserInterface
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
Content.ScaleTo(1, 1000, Easing.OutElastic); Content.ScaleTo(1, 1000, Easing.OutElastic);
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
} }
} }

View File

@ -129,10 +129,10 @@ namespace osu.Game.Graphics.UserInterface
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
Content.ScaleTo(1, 1000, Easing.OutElastic); Content.ScaleTo(1, 1000, Easing.OutElastic);
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
protected virtual SpriteText CreateText() => new OsuSpriteText protected virtual SpriteText CreateText() => new OsuSpriteText

View File

@ -128,10 +128,10 @@ namespace osu.Game.Graphics.UserInterface
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
Nub.Current.Value = false; Nub.Current.Value = false;
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
protected override void OnUserChange(T value) protected override void OnUserChange(T value)

View File

@ -55,10 +55,10 @@ namespace osu.Game.Online.Leaderboards
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
icon.ScaleTo(1, 1000, Easing.OutElastic); icon.ScaleTo(1, 1000, Easing.OutElastic);
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
} }
} }

View File

@ -31,10 +31,10 @@ namespace osu.Game.Online.Placeholders
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
this.ScaleTo(1, 1000, Easing.OutElastic); this.ScaleTo(1, 1000, Easing.OutElastic);
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)

View File

@ -141,16 +141,13 @@ namespace osu.Game.Overlays.Chat.Tabs
updateState(); updateState();
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
switch (e.Button) switch (e.Button)
{ {
case MouseButton.Middle: case MouseButton.Middle:
CloseButton.Click(); CloseButton.Click();
return true; break;
default:
return false;
} }
} }

View File

@ -34,10 +34,10 @@ namespace osu.Game.Overlays.Chat.Tabs
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
icon.ScaleTo(0.75f, 1000, Easing.OutElastic); icon.ScaleTo(0.75f, 1000, Easing.OutElastic);
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)

View File

@ -299,7 +299,7 @@ namespace osu.Game.Overlays
return true; return true;
} }
protected override bool OnDrag(DragEvent e) protected override void OnDrag(DragEvent e)
{ {
if (isDragging) if (isDragging)
{ {
@ -311,14 +311,12 @@ namespace osu.Game.Overlays
ChatHeight.Value = targetChatHeight; ChatHeight.Value = targetChatHeight;
} }
return true;
} }
protected override bool OnDragEnd(DragEndEvent e) protected override void OnDragEnd(DragEndEvent e)
{ {
isDragging = false; isDragging = false;
return base.OnDragEnd(e); base.OnDragEnd(e);
} }
private void selectTab(int index) private void selectTab(int index)

View File

@ -177,17 +177,19 @@ namespace osu.Game.Overlays.KeyBinding
return true; return true;
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
// don't do anything until the last button is released. // don't do anything until the last button is released.
if (!HasFocus || e.HasAnyButtonPressed) if (!HasFocus || e.HasAnyButtonPressed)
return base.OnMouseUp(e); {
base.OnMouseUp(e);
return;
}
if (bindTarget.IsHovered) if (bindTarget.IsHovered)
finalise(); finalise();
else else
updateBindTarget(); updateBindTarget();
return true;
} }
protected override bool OnScroll(ScrollEvent e) protected override bool OnScroll(ScrollEvent e)
@ -313,14 +315,6 @@ namespace osu.Game.Overlays.KeyBinding
Size = new Vector2(80, 20); Size = new Vector2(80, 20);
} }
protected override bool OnMouseUp(MouseUpEvent e)
{
base.OnMouseUp(e);
// without this, the mouse up triggers a finalise (and deselection) of the current binding target.
return true;
}
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {

View File

@ -158,7 +158,7 @@ namespace osu.Game.Overlays.Mods
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
scaleContainer.ScaleTo(1, 500, Easing.OutElastic); scaleContainer.ScaleTo(1, 500, Easing.OutElastic);
@ -172,8 +172,6 @@ namespace osu.Game.Overlays.Mods
break; break;
} }
} }
return true;
} }
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)

View File

@ -43,10 +43,10 @@ namespace osu.Game.Overlays.Music
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
IsDraggable = false; IsDraggable = false;
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
private bool selected; private bool selected;

View File

@ -136,29 +136,29 @@ namespace osu.Game.Overlays.Music
return draggedItem != null || base.OnDragStart(e); return draggedItem != null || base.OnDragStart(e);
} }
protected override bool OnDrag(DragEvent e) protected override void OnDrag(DragEvent e)
{ {
nativeDragPosition = e.ScreenSpaceMousePosition; nativeDragPosition = e.ScreenSpaceMousePosition;
if (draggedItem == null)
return base.OnDrag(e);
return true; if (draggedItem == null)
base.OnDrag(e);
} }
protected override bool OnDragEnd(DragEndEvent e) protected override void OnDragEnd(DragEndEvent e)
{ {
nativeDragPosition = e.ScreenSpaceMousePosition; nativeDragPosition = e.ScreenSpaceMousePosition;
if (draggedItem == null) if (draggedItem == null)
return base.OnDragEnd(e); {
base.OnDragEnd(e);
return;
}
if (dragDestination != null) if (dragDestination != null)
musicController.ChangeBeatmapSetPosition(draggedItem.BeatmapSetInfo, dragDestination.Value); musicController.ChangeBeatmapSetPosition(draggedItem.BeatmapSetInfo, dragDestination.Value);
draggedItem = null; draggedItem = null;
dragDestination = null; dragDestination = null;
return true;
} }
protected override void Update() protected override void Update()

View File

@ -385,7 +385,7 @@ namespace osu.Game.Overlays
return true; return true;
} }
protected override bool OnDrag(DragEvent e) protected override void OnDrag(DragEvent e)
{ {
Vector2 change = e.MousePosition - e.MouseDownPosition; Vector2 change = e.MousePosition - e.MouseDownPosition;
@ -393,13 +393,12 @@ namespace osu.Game.Overlays
change *= change.Length <= 0 ? 0 : MathF.Pow(change.Length, 0.7f) / change.Length; change *= change.Length <= 0 ? 0 : MathF.Pow(change.Length, 0.7f) / change.Length;
this.MoveTo(change); this.MoveTo(change);
return true;
} }
protected override bool OnDragEnd(DragEndEvent e) protected override void OnDragEnd(DragEndEvent e)
{ {
this.MoveTo(Vector2.Zero, 800, Easing.OutElastic); this.MoveTo(Vector2.Zero, 800, Easing.OutElastic);
return base.OnDragEnd(e); base.OnDragEnd(e);
} }
} }

View File

@ -32,12 +32,14 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
} }
protected override bool OnDragStart(DragStartEvent e) => true; protected override bool OnDragStart(DragStartEvent e) => true;
protected override bool OnDragEnd(DragEndEvent e) => true;
protected override bool OnDrag(DragEvent e) protected override void OnDragEnd(DragEndEvent e)
{
}
protected override void OnDrag(DragEvent e)
{ {
seekToPosition(e.ScreenSpaceMousePosition); seekToPosition(e.ScreenSpaceMousePosition);
return true;
} }
protected override bool OnMouseDown(MouseDownEvent e) protected override bool OnMouseDown(MouseDownEvent e)

View File

@ -262,10 +262,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
marker.Active = false; marker.Active = false;
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)
@ -274,10 +274,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
return true; return true;
} }
protected override bool OnDrag(DragEvent e) protected override void OnDrag(DragEvent e)
{ {
handleMouseInput(e.ScreenSpaceMousePosition); handleMouseInput(e.ScreenSpaceMousePosition);
return true;
} }
private void handleMouseInput(Vector2 screenSpaceMousePosition) private void handleMouseInput(Vector2 screenSpaceMousePosition)

View File

@ -129,11 +129,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
return true; return true;
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
// Special case for when a drag happened instead of a click // Special case for when a drag happened instead of a click
Schedule(() => endClickSelection()); Schedule(() => endClickSelection());
return e.Button == MouseButton.Left;
} }
protected override bool OnMouseMove(MouseMoveEvent e) protected override bool OnMouseMove(MouseMoveEvent e)
@ -161,29 +160,25 @@ namespace osu.Game.Screens.Edit.Compose.Components
return true; return true;
} }
protected override bool OnDrag(DragEvent e) protected override void OnDrag(DragEvent e)
{ {
if (e.Button == MouseButton.Right) if (e.Button == MouseButton.Right)
return false; return;
if (!moveCurrentSelection(e)) if (!moveCurrentSelection(e))
dragBox.UpdateDrag(e); dragBox.UpdateDrag(e);
return true;
} }
protected override bool OnDragEnd(DragEndEvent e) protected override void OnDragEnd(DragEndEvent e)
{ {
if (e.Button == MouseButton.Right) if (e.Button == MouseButton.Right)
return false; return;
if (!finishSelectionMovement()) if (!finishSelectionMovement())
{ {
dragBox.FadeOut(250, Easing.OutQuint); dragBox.FadeOut(250, Easing.OutQuint);
selectionHandler.UpdateVisibility(); selectionHandler.UpdateVisibility();
} }
return true;
} }
protected override bool OnKeyDown(KeyDownEvent e) protected override bool OnKeyDown(KeyDownEvent e)

View File

@ -143,10 +143,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
return false; return false;
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
endUserDrag(); endUserDrag();
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
private void beginUserDrag() private void beginUserDrag()

View File

@ -194,10 +194,10 @@ namespace osu.Game.Screens.Menu
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
boxHoverLayer.FadeTo(0, 1000, Easing.OutQuint); boxHoverLayer.FadeTo(0, 1000, Easing.OutQuint);
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)

View File

@ -353,12 +353,11 @@ namespace osu.Game.Screens.Menu
return true; return true;
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
if (e.Button != MouseButton.Left) return false; if (e.Button != MouseButton.Left) return;
logoBounceContainer.ScaleTo(1f, 500, Easing.OutElastic); logoBounceContainer.ScaleTo(1f, 500, Easing.OutElastic);
return true;
} }
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)

View File

@ -163,7 +163,9 @@ namespace osu.Game.Screens.Play
// Don't let mouse down events through the overlay or people can click circles while paused. // Don't let mouse down events through the overlay or people can click circles while paused.
protected override bool OnMouseDown(MouseDownEvent e) => true; protected override bool OnMouseDown(MouseDownEvent e) => true;
protected override bool OnMouseUp(MouseUpEvent e) => true; protected override void OnMouseUp(MouseUpEvent e)
{
}
protected override bool OnMouseMove(MouseMoveEvent e) => true; protected override bool OnMouseMove(MouseMoveEvent e) => true;

View File

@ -278,11 +278,10 @@ namespace osu.Game.Screens.Play.HUD
return true; return true;
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
if (!e.HasAnyButtonPressed) if (!e.HasAnyButtonPressed)
AbortConfirm(); AbortConfirm();
return true;
} }
} }
} }

View File

@ -45,10 +45,10 @@ namespace osu.Game.Screens.Play
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
if (e.Button == Button) IsLit = false; if (e.Button == Button) IsLit = false;
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
} }
} }

View File

@ -202,10 +202,9 @@ namespace osu.Game.Screens.Play
return true; return true;
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
Show(); Show();
return true;
} }
public override void Hide() => State = Visibility.Hidden; public override void Hide() => State = Visibility.Hidden;
@ -311,10 +310,10 @@ namespace osu.Game.Screens.Play
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
aspect.ScaleTo(1, 1000, Easing.OutElastic); aspect.ScaleTo(1, 1000, Easing.OutElastic);
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)

View File

@ -118,10 +118,10 @@ namespace osu.Game.Screens.Select
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
box.FadeOut(Footer.TRANSITION_LENGTH, Easing.OutQuint); box.FadeOut(Footer.TRANSITION_LENGTH, Easing.OutQuint);
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)

View File

@ -60,10 +60,10 @@ namespace osu.Game.Screens.Select.Options
return base.OnMouseDown(e); return base.OnMouseDown(e);
} }
protected override bool OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
flash.FadeTo(0, 1000, Easing.OutQuint); flash.FadeTo(0, 1000, Easing.OutQuint);
return base.OnMouseUp(e); base.OnMouseUp(e);
} }
protected override bool OnClick(ClickEvent e) protected override bool OnClick(ClickEvent e)