h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 02:22:56 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1449 from peppy/less-internal

Browse Source 
Use internal less
This commit is contained in:
Dan Balasescu 2017-11-01 17:32:52 +09:00 committed by GitHub
commit 012a81a52e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ using osu.Framework.Configuration;
namespace osu.Game.Graphics.Containers
{
internal class ParallaxContainer : Container, IRequireHighFrequencyMousePosition
public class ParallaxContainer : Container, IRequireHighFrequencyMousePosition
{
public float ParallaxAmount = 0.02f;

2
osu.Game/Screens/Edit/Editor.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Screens.Edit
{
protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4");
internal override bool ShowOverlays => false;
public override bool ShowOverlays => false;
private readonly Box bottomBackground;
private readonly Container screenContainer;

2
osu.Game/Screens/Loader.cs
View File

@ -8,7 +8,7 @@ namespace osu.Game.Screens
{
internal class Loader : OsuScreen
{
internal override bool ShowOverlays => false;
public override bool ShowOverlays => false;
public Loader()
{

6
osu.Game/Screens/Menu/Disclaimer.cs
View File

@ -12,15 +12,15 @@ using OpenTK.Graphics;
namespace osu.Game.Screens.Menu
{
internal class Disclaimer : OsuScreen
public class Disclaimer : OsuScreen
{
private Intro intro;
private readonly SpriteIcon icon;
private Color4 iconColour;
internal override bool ShowOverlays => false;
public override bool ShowOverlays => false;
internal override bool HasLocalCursorDisplayed => true;
public override bool HasLocalCursorDisplayed => true;
public Disclaimer()
{

4
osu.Game/Screens/Menu/Intro.cs
View File

@ -33,9 +33,9 @@ namespace osu.Game.Screens.Menu
private SampleChannel welcome;
private SampleChannel seeya;
internal override bool HasLocalCursorDisplayed => true;
public override bool HasLocalCursorDisplayed => true;
internal override bool ShowOverlays => false;
public override bool ShowOverlays => false;
protected override BackgroundScreen CreateBackground() => new BackgroundScreenEmpty();

2
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Screens.Menu
{
private readonly ButtonSystem buttons;
internal override bool ShowOverlays => buttons.State != MenuState.Initial;
public override bool ShowOverlays => buttons.State != MenuState.Initial;
private readonly BackgroundScreenDefault background;
private Screen songSelect;

8
osu.Game/Screens/OsuScreen.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Screens
{
public abstract class OsuScreen : Screen
{
internal BackgroundScreen Background { get; private set; }
public BackgroundScreen Background { get; private set; }
/// <summary>
/// Override to create a BackgroundMode for the current screen.
@ -24,17 +24,17 @@ namespace osu.Game.Screens
/// </summary>
protected virtual BackgroundScreen CreateBackground() => null;
internal virtual bool ShowOverlays => true;
public virtual bool ShowOverlays => true;
protected new OsuGameBase Game => base.Game as OsuGameBase;
internal virtual bool HasLocalCursorDisplayed => false;
public virtual bool HasLocalCursorDisplayed => false;
/// <summary>
/// Whether the beatmap or ruleset should be allowed to be changed by the user or game.
/// Used to mark exclusive areas where this is strongly prohibited, like gameplay.
/// </summary>
internal virtual bool AllowBeatmapRulesetChange => true;
public virtual bool AllowBeatmapRulesetChange => true;
protected readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();

6
osu.Game/Screens/Play/Player.cs
View File

@ -34,13 +34,13 @@ namespace osu.Game.Screens.Play
{
protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap);
internal override bool ShowOverlays => false;
public override bool ShowOverlays => false;
internal override bool HasLocalCursorDisplayed => !pauseContainer.IsPaused && !HasFailed && RulesetContainer.ProvidingUserCursor;
public override bool HasLocalCursorDisplayed => !pauseContainer.IsPaused && !HasFailed && RulesetContainer.ProvidingUserCursor;
public Action RestartRequested;
internal override bool AllowBeatmapRulesetChange => false;
public override bool AllowBeatmapRulesetChange => false;
public bool HasFailed { get; private set; }

4
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -24,9 +24,9 @@ namespace osu.Game.Screens.Play
private BeatmapMetadataDisplay info;
private bool showOverlays = true;
internal override bool ShowOverlays => showOverlays;
public override bool ShowOverlays => showOverlays;
internal override bool AllowBeatmapRulesetChange => false;
public override bool AllowBeatmapRulesetChange => false;
protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap);

2
osu.Game/Screens/Ranking/Results.cs
View File

@ -31,7 +31,7 @@ namespace osu.Game.Screens.Ranking
private ResultModeTabControl modeChangeButtons;
internal override bool AllowBeatmapRulesetChange => false;
public override bool AllowBeatmapRulesetChange => false;
private Container currentPage;

2
osu.Game/Screens/Tournament/Drawings.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Screens.Tournament
{
private const string results_filename = "drawings_results.txt";
internal override bool ShowOverlays => false;
public override bool ShowOverlays => false;
protected override BackgroundScreen CreateBackground() => new BackgroundScreenDefault();