h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 17:47:29 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into settings-improvements

Browse Source
This commit is contained in:
Dan Balasescu 2017-07-14 19:22:45 +10:00 committed by GitHub
commit a6d917285a
11 changed files with 90 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 428cb7fcadfdc6656ec4b0398ecfe2820e2e1bdb
Subproject commit 991177da4fbed2dd8260c215f2d341ebc858b03e

75
osu.Game/Graphics/Containers/OsuScrollContainer.cs Normal file
View File

@ -0,0 +1,75 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics.Containers;
using osu.Framework.Input;
using OpenTK.Input;
namespace osu.Game.Graphics.Containers
{
internal class OsuScrollContainer : ScrollContainer
{
/// <summary>
/// Allows controlling the scroll bar from any position in the container using the right mouse button.
/// Uses the value of <see cref="DistanceDecayOnRightMouseScrollbar"/> to smoothly scroll to the dragged location.
/// </summary>
public bool RightMouseScrollbar = false;
/// <summary>
/// Controls the rate with which the target position is approached when performing a relative drag. Default is 0.02.
/// </summary>
public double DistanceDecayOnRightMouseScrollbar = 0.02;
private bool shouldPerformRightMouseScroll(InputState state) => RightMouseScrollbar && state.Mouse.IsPressed(MouseButton.Right);
private void scrollToRelative(float value) => ScrollTo(Clamp((value - Scrollbar.DrawSize[ScrollDim] / 2) / Scrollbar.Size[ScrollDim]), true, DistanceDecayOnRightMouseScrollbar);
private bool mouseScrollBarDragging;
protected override bool IsDragging => base.IsDragging || mouseScrollBarDragging;
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
{
if (shouldPerformRightMouseScroll(state))
{
scrollToRelative(state.Mouse.Position[ScrollDim]);
return true;
}
return base.OnMouseDown(state, args);
}
protected override bool OnDrag(InputState state)
{
if (mouseScrollBarDragging)
{
scrollToRelative(state.Mouse.Position[ScrollDim]);
return true;
}
return base.OnDrag(state);
}
protected override bool OnDragStart(InputState state)
{
if (shouldPerformRightMouseScroll(state))
{
mouseScrollBarDragging = true;
return true;
}
return base.OnDragStart(state);
}
protected override bool OnDragEnd(InputState state)
{
if (mouseScrollBarDragging)
{
mouseScrollBarDragging = false;
return true;
}
return base.OnDragEnd(state);
}
}
}

2
osu.Game/Graphics/Containers/SectionsContainer.cs
View File

@ -114,7 +114,7 @@ namespace osu.Game.Graphics.Containers
public SectionsContainer()
{
Add(ScrollContainer = new ScrollContainer
Add(ScrollContainer = new OsuScrollContainer
{
RelativeSizeAxes = Axes.Both,
Masking = false,

2
osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs
View File

@ -81,7 +81,7 @@ namespace osu.Game.Overlays.Chat
Padding = new MarginPadding { Top = 85, Right = WIDTH_PADDING },
Children = new[]
{
new ScrollContainer
new OsuScrollContainer
{
RelativeSizeAxes = Axes.Both,
Children = new[]

3
osu.Game/Overlays/Chat/DrawableChannel.cs
View File

@ -7,6 +7,7 @@ using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics.Containers;
using osu.Game.Online.Chat;
namespace osu.Game.Overlays.Chat
@ -25,7 +26,7 @@ namespace osu.Game.Overlays.Chat
Children = new Drawable[]
{
scroll = new ScrollContainer
scroll = new OsuScrollContainer
{
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]

3
osu.Game/Overlays/Music/PlaylistList.cs
View File

@ -7,6 +7,7 @@ using System.Linq;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Database;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays.Music
{
@ -49,7 +50,7 @@ namespace osu.Game.Overlays.Music
{
Children = new Drawable[]
{
new ScrollContainer
new OsuScrollContainer
{
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]

2
osu.Game/Overlays/NotificationManager.cs
View File

@ -36,7 +36,7 @@ namespace osu.Game.Overlays
Colour = Color4.Black,
Alpha = 0.6f,
},
scrollContainer = new ScrollContainer
scrollContainer = new OsuScrollContainer
{
RelativeSizeAxes = Axes.Both,
Margin = new MarginPadding { Top = Toolbar.Toolbar.HEIGHT },

3
osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays.SearchableList
{
@ -60,7 +61,7 @@ namespace osu.Game.Overlays.SearchableList
RelativeSizeAxes = Axes.Both,
Children = new[]
{
new ScrollContainer
new OsuScrollContainer
{
RelativeSizeAxes = Axes.Both,
ScrollbarVisible = false,

3
osu.Game/Screens/Multiplayer/RoomInspector.cs
View File

@ -16,6 +16,7 @@ using osu.Framework.Localisation;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Database;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Multiplayer;
using osu.Game.Users;
@ -249,7 +250,7 @@ namespace osu.Game.Screens.Multiplayer
},
},
},
participantsScroll = new ScrollContainer
participantsScroll = new OsuScrollContainer
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,

3
osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
View File

@ -12,6 +12,7 @@ using System;
using osu.Framework.Allocation;
using osu.Framework.Threading;
using osu.Game.Database;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets.Scoring;
using osu.Game.Online.API;
@ -74,7 +75,7 @@ namespace osu.Game.Screens.Select.Leaderboards
{
Children = new Drawable[]
{
scrollContainer = new ScrollContainer
scrollContainer = new OsuScrollContainer
{
RelativeSizeAxes = Axes.Both,
ScrollbarVisible = false,

1
osu.Game/osu.Game.csproj
View File

@ -78,6 +78,7 @@
<Compile Include="Beatmaps\DifficultyCalculator.cs" />
<Compile Include="Graphics\Containers\OsuClickableContainer.cs" />
<Compile Include="Graphics\Containers\OsuFocusedOverlayContainer.cs" />
<Compile Include="Graphics\Containers\OsuScrollContainer.cs" />
<Compile Include="Graphics\Cursor\OsuContextMenuContainer.cs" />
<Compile Include="Graphics\UserInterface\IconButton.cs" />
<Compile Include="Configuration\SelectionRandomType.cs" />