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

Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode

Browse Source
This commit is contained in:
Thomas Müller
2017-07-08 12:25:08 +03:00
parent 40225238d9 3570ec52a5
commit 178685292a
110 changed files with 484 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Select/FilterControl.cs
View File

@ -67,7 +67,7 @@ namespace osu.Game.Screens.Select
private readonly SearchTextBox searchTextBox;
public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || groupTabs.Contains(screenSpacePos) || sortTabs.Contains(screenSpacePos);
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => base.ReceiveMouseInputAt(screenSpacePos) || groupTabs.ReceiveMouseInputAt(screenSpacePos) || sortTabs.ReceiveMouseInputAt(screenSpacePos);
public FilterControl()
{

2
osu.Game/Screens/Select/Footer.cs
View File

@ -124,7 +124,7 @@ namespace osu.Game.Screens.Select
updateModeLight();
}
public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || StartButton.Contains(screenSpacePos);
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => base.ReceiveMouseInputAt(screenSpacePos) || StartButton.ReceiveMouseInputAt(screenSpacePos);
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;

4
osu.Game/Screens/Select/FooterButton.cs
View File

@ -6,15 +6,15 @@ using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.Select
{
public class FooterButton : ClickableContainer
public class FooterButton : OsuClickableContainer
{
private static readonly Vector2 shearing = new Vector2(0.15f, 0);

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

@ -13,10 +13,11 @@ using osu.Game.Rulesets.Mods;
using osu.Game.Users;
using osu.Framework;
using osu.Game.Rulesets.Scoring;
using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.Select.Leaderboards
{
public class LeaderboardScore : ClickableContainer, IStateful<Visibility>
public class LeaderboardScore : OsuClickableContainer, IStateful<Visibility>
{
public static readonly float HEIGHT = 60;

5
osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
View File

@ -11,10 +11,11 @@ using osu.Game.Graphics.Sprites;
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.Select.Options
{
public class BeatmapOptionsButton : ClickableContainer
public class BeatmapOptionsButton : OsuClickableContainer
{
private const float width = 130;
@ -83,7 +84,7 @@ namespace osu.Game.Screens.Select.Options
return false;
}
public override bool Contains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => box.ReceiveMouseInputAt(screenSpacePos);
public BeatmapOptionsButton()
{

2
osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
View File

@ -14,7 +14,7 @@ using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.Select.Options
{
public class BeatmapOptionsOverlay : FocusedOverlayContainer
public class BeatmapOptionsOverlay : OsuFocusedOverlayContainer
{
private const float transition_duration = 500;
private const float x_position = 0.2f;

9
osu.Game/Screens/Select/SongSelect.cs
View File

@ -281,10 +281,13 @@ namespace osu.Game.Screens.Select
{
base.Dispose(isDisposing);
database.BeatmapSetAdded -= onBeatmapSetAdded;
database.BeatmapSetRemoved -= onBeatmapSetRemoved;
if (database != null)
{
database.BeatmapSetAdded -= onBeatmapSetAdded;
database.BeatmapSetRemoved -= onBeatmapSetRemoved;
}
initialAddSetsTask.Cancel();
initialAddSetsTask?.Cancel();
}
private void changeBackground(WorkingBeatmap beatmap)