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

Renamespace compose-mode components

Browse Source
This commit is contained in:
smoogipoo 2018-11-06 18:14:46 +09:00
parent 27d82052f4
commit ac25718c5a
20 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Tests/Visual/TestCaseBeatDivisorControl.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Screens.Edit.Screens.Compose; using osu.Game.Screens.Edit.Screens.Compose;
using osu.Game.Screens.Edit.Screens.Compose.Components;
using OpenTK; using OpenTK;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual

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

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Screens.Edit.Screens.Compose.RadioButtons; using osu.Game.Screens.Edit.Components.RadioButtons;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {

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

@ -13,7 +13,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Framework.Timing; using osu.Framework.Timing;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Screens.Edit.Screens.Compose.Timeline; using osu.Game.Screens.Edit.Screens.Compose.Components.Timeline;
using OpenTK.Graphics; using OpenTK.Graphics;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual

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

@ -17,7 +17,7 @@ using osu.Game.Rulesets.Osu.Edit.Masks.HitCircleMasks;
using osu.Game.Rulesets.Osu.Edit.Masks.HitCircleMasks.Components; using osu.Game.Rulesets.Osu.Edit.Masks.HitCircleMasks.Components;
using osu.Game.Rulesets.Osu.Objects; using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Screens.Edit.Screens.Compose; using osu.Game.Screens.Edit.Screens.Compose;
using osu.Game.Screens.Edit.Screens.Compose.Layers; using osu.Game.Screens.Edit.Screens.Compose.Components;
using osu.Game.Tests.Beatmaps; using osu.Game.Tests.Beatmaps;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual

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

@ -10,7 +10,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.MathUtils; using osu.Framework.MathUtils;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Cursor; using osu.Game.Graphics.Cursor;
using osu.Game.Screens.Edit.Screens.Compose.Timeline; using osu.Game.Screens.Edit.Screens.Compose.Components.Timeline;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;

4
osu.Game/Rulesets/Edit/HitObjectComposer.cs
View File

@ -16,8 +16,8 @@ using osu.Game.Rulesets.Edit.Tools;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
using osu.Game.Screens.Edit.Screens.Compose.Layers; using osu.Game.Screens.Edit.Components.RadioButtons;
using osu.Game.Screens.Edit.Screens.Compose.RadioButtons; using osu.Game.Screens.Edit.Screens.Compose.Components;
namespace osu.Game.Rulesets.Edit namespace osu.Game.Rulesets.Edit
{ {

6
osu.Game/Screens/Edit/Screens/Compose/RadioButtons/DrawableRadioButton.cs → osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
View File

@ -2,8 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System; using System;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -14,8 +12,10 @@ 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.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Screens.Edit.Screens.Compose.RadioButtons namespace osu.Game.Screens.Edit.Components.RadioButtons
{ {
public class DrawableRadioButton : TriangleButton public class DrawableRadioButton : TriangleButton
{ {

2
osu.Game/Screens/Edit/Screens/Compose/RadioButtons/RadioButton.cs → osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
View File

@ -4,7 +4,7 @@
using System; using System;
using osu.Framework.Configuration; using osu.Framework.Configuration;
namespace osu.Game.Screens.Edit.Screens.Compose.RadioButtons namespace osu.Game.Screens.Edit.Components.RadioButtons
{ {
public class RadioButton public class RadioButton
{ {

4
osu.Game/Screens/Edit/Screens/Compose/RadioButtons/RadioButtonCollection.cs → osu.Game/Screens/Edit/Components/RadioButtons/RadioButtonCollection.cs
View File

@ -2,12 +2,12 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic; using System.Collections.Generic;
using OpenTK;
using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using OpenTK;
namespace osu.Game.Screens.Edit.Screens.Compose.RadioButtons namespace osu.Game.Screens.Edit.Components.RadioButtons
{ {
public class RadioButtonCollection : CompositeDrawable public class RadioButtonCollection : CompositeDrawable
{ {

2
osu.Game/Screens/Edit/Screens/Compose/BeatDivisorControl.cs → osu.Game/Screens/Edit/Screens/Compose/Components/BeatDivisorControl.cs
View File

@ -19,7 +19,7 @@ using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using OpenTK.Input; using OpenTK.Input;
namespace osu.Game.Screens.Edit.Screens.Compose namespace osu.Game.Screens.Edit.Screens.Compose.Components
{ {
public class BeatDivisorControl : CompositeDrawable public class BeatDivisorControl : CompositeDrawable
{ {

2
osu.Game/Screens/Edit/Screens/Compose/Layers/BlueprintContainer.cs → osu.Game/Screens/Edit/Screens/Compose/Components/BlueprintContainer.cs
View File

@ -14,7 +14,7 @@ using osu.Game.Rulesets.Edit.Tools;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using OpenTK; using OpenTK;
namespace osu.Game.Screens.Edit.Screens.Compose.Layers namespace osu.Game.Screens.Edit.Screens.Compose.Components
{ {
public class BlueprintContainer : CompositeDrawable public class BlueprintContainer : CompositeDrawable
{ {

2
osu.Game/Screens/Edit/Screens/Compose/Layers/DragBox.cs → osu.Game/Screens/Edit/Screens/Compose/Components/DragBox.cs
View File

@ -10,7 +10,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using OpenTK.Graphics; using OpenTK.Graphics;
namespace osu.Game.Screens.Edit.Screens.Compose.Layers namespace osu.Game.Screens.Edit.Screens.Compose.Components
{ {
/// <summary> /// <summary>
/// A box that displays the drag selection and provides selection events for users to handle. /// A box that displays the drag selection and provides selection events for users to handle.

2
osu.Game/Screens/Edit/Screens/Compose/Layers/EditorPlayfieldBorder.cs → osu.Game/Screens/Edit/Screens/Compose/Components/EditorPlayfieldBorder.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using OpenTK.Graphics; using OpenTK.Graphics;
namespace osu.Game.Screens.Edit.Screens.Compose.Layers namespace osu.Game.Screens.Edit.Screens.Compose.Components
{ {
/// <summary> /// <summary>
/// Provides a border around the playfield. /// Provides a border around the playfield.

2
osu.Game/Screens/Edit/Screens/Compose/Layers/SelectionBox.cs → osu.Game/Screens/Edit/Screens/Compose/Components/SelectionBox.cs
View File

@ -16,7 +16,7 @@ using osu.Game.Rulesets.Edit.Types;
using OpenTK; using OpenTK;
using OpenTK.Input; using OpenTK.Input;
namespace osu.Game.Screens.Edit.Screens.Compose.Layers namespace osu.Game.Screens.Edit.Screens.Compose.Components
{ {
/// <summary> /// <summary>
/// A box which surrounds <see cref="SelectionBlueprint"/>s and provides interactive handles, context menus etc. /// A box which surrounds <see cref="SelectionBlueprint"/>s and provides interactive handles, context menus etc.

2
osu.Game/Screens/Edit/Screens/Compose/Timeline/CentreMarker.cs → osu.Game/Screens/Edit/Screens/Compose/Components/Timeline/CentreMarker.cs
View File

@ -8,7 +8,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics; using osu.Game.Graphics;
using OpenTK; using OpenTK;
namespace osu.Game.Screens.Edit.Screens.Compose.Timeline namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
{ {
public class CentreMarker : CompositeDrawable public class CentreMarker : CompositeDrawable
{ {

2
osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs → osu.Game/Screens/Edit/Screens/Compose/Components/Timeline/Timeline.cs
View File

@ -12,7 +12,7 @@ using osu.Framework.Timing;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics; using osu.Game.Graphics;
namespace osu.Game.Screens.Edit.Screens.Compose.Timeline namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
{ {
public class Timeline : ZoomableScrollContainer public class Timeline : ZoomableScrollContainer
{ {

4
osu.Game/Screens/Edit/Screens/Compose/Timeline/TimelineArea.cs → osu.Game/Screens/Edit/Screens/Compose/Components/Timeline/TimelineArea.cs
View File

@ -1,14 +1,14 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK;
using osu.Framework.Graphics; 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.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using OpenTK;
namespace osu.Game.Screens.Edit.Screens.Compose.Timeline namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
{ {
public class TimelineArea : CompositeDrawable public class TimelineArea : CompositeDrawable
{ {

6
osu.Game/Screens/Edit/Screens/Compose/Timeline/TimelineButton.cs → osu.Game/Screens/Edit/Screens/Compose/Components/Timeline/TimelineButton.cs
View File

@ -2,15 +2,15 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System; using System;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Screens.Edit.Screens.Compose.Timeline namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
{ {
public class TimelineButton : CompositeDrawable public class TimelineButton : CompositeDrawable
{ {

2
osu.Game/Screens/Edit/Screens/Compose/Timeline/ZoomableScrollContainer.cs → osu.Game/Screens/Edit/Screens/Compose/Components/Timeline/ZoomableScrollContainer.cs
View File

@ -9,7 +9,7 @@ using osu.Framework.Input.Events;
using osu.Framework.MathUtils; using osu.Framework.MathUtils;
using OpenTK; using OpenTK;
namespace osu.Game.Screens.Edit.Screens.Compose.Timeline namespace osu.Game.Screens.Edit.Screens.Compose.Components.Timeline
{ {
public class ZoomableScrollContainer : ScrollContainer public class ZoomableScrollContainer : ScrollContainer
{ {

3
osu.Game/Screens/Edit/Screens/Compose/Compose.cs
View File

@ -11,7 +11,8 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Game.Rulesets.Edit; using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Screens.Edit.Screens.Compose.Timeline; using osu.Game.Screens.Edit.Screens.Compose.Components;
using osu.Game.Screens.Edit.Screens.Compose.Components.Timeline;
namespace osu.Game.Screens.Edit.Screens.Compose namespace osu.Game.Screens.Edit.Screens.Compose
{ {