sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-23 12:18:03 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix up post-merge issues

Browse Source
This commit is contained in:
smoogipoo 2017-12-08 17:41:10 +09:00
parent f41af191ed
commit faa921ba05
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit d231ca9f79936f3a7f3cff0c7721587755ae168c Subproject commit 797a351db2e852fef5296453641ffbf6b2f6dc11

8
osu.Game.Tests/Visual/TestCaseEditorPlayfieldOverlay.cs → osu.Game.Tests/Visual/TestCaseEditorSelectionLayer.cs
View File

@ -16,11 +16,11 @@ using osu.Game.Rulesets.Osu.UI;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
public class TestCaseEditorPlayfieldOverlay : OsuTestCase public class TestCaseEditorSelectionLayer : OsuTestCase
{ {
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(PlayfieldOverlay) }; public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(SelectionLayer) };
public TestCaseEditorPlayfieldOverlay() public TestCaseEditorSelectionLayer()
{ {
var playfield = new OsuEditPlayfield(); var playfield = new OsuEditPlayfield();
playfield.Add(new DrawableHitCircle(new HitCircle { Position = new Vector2(256, 192), Scale = 0.5f })); playfield.Add(new DrawableHitCircle(new HitCircle { Position = new Vector2(256, 192), Scale = 0.5f }));
@ -47,7 +47,7 @@ namespace osu.Game.Tests.Visual
Clock = new FramedClock(new StopwatchClock()), Clock = new FramedClock(new StopwatchClock()),
Child = playfield Child = playfield
}, },
new PlayfieldOverlay(playfield) new SelectionLayer(playfield)
}; };
} }
} }

2
osu.Game.Tests/osu.Game.Tests.csproj
View File

@ -108,7 +108,7 @@
<Compile Include="Visual\TestCaseEditorComposeTimeline.cs" /> <Compile Include="Visual\TestCaseEditorComposeTimeline.cs" />
<Compile Include="Visual\TestCaseEditorMenuBar.cs" /> <Compile Include="Visual\TestCaseEditorMenuBar.cs" />
<Compile Include="Visual\TestCaseEditorSummaryTimeline.cs" /> <Compile Include="Visual\TestCaseEditorSummaryTimeline.cs" />
<Compile Include="Visual\TestCaseEditorPlayfieldOverlay.cs" /> <Compile Include="Visual\TestCaseEditorSelectionLayer.cs" />
<Compile Include="Visual\TestCaseGamefield.cs" /> <Compile Include="Visual\TestCaseGamefield.cs" />
<Compile Include="Visual\TestCaseGraph.cs" /> <Compile Include="Visual\TestCaseGraph.cs" />
<Compile Include="Visual\TestCaseIconButton.cs" /> <Compile Include="Visual\TestCaseIconButton.cs" />

4
osu.Game/Rulesets/Edit/PlayfieldOverlay.cs → osu.Game/Rulesets/Edit/SelectionLayer.cs
View File

@ -17,7 +17,7 @@ using osu.Game.Graphics;
namespace osu.Game.Rulesets.Edit namespace osu.Game.Rulesets.Edit
{ {
public class PlayfieldOverlay : CompositeDrawable public class SelectionLayer : CompositeDrawable
{ {
private readonly static Color4 selection_normal_colour = Color4.White; private readonly static Color4 selection_normal_colour = Color4.White;
private readonly static Color4 selection_attached_colour = OsuColour.FromHex("eeaa00"); private readonly static Color4 selection_attached_colour = OsuColour.FromHex("eeaa00");
@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Edit
private readonly Playfield playfield; private readonly Playfield playfield;
public PlayfieldOverlay(Playfield playfield) public SelectionLayer(Playfield playfield)
{ {
this.playfield = playfield; this.playfield = playfield;

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

@ -565,6 +565,7 @@
<Compile Include="Rulesets\Edit\Tools\ICompositionTool.cs" /> <Compile Include="Rulesets\Edit\Tools\ICompositionTool.cs" />
<Compile Include="Rulesets\Edit\HitObjectComposer.cs" /> <Compile Include="Rulesets\Edit\HitObjectComposer.cs" />
<Compile Include="Rulesets\Edit\SelectionDragger.cs" /> <Compile Include="Rulesets\Edit\SelectionDragger.cs" />
<Compile Include="Rulesets\Edit\SelectionLayer.cs" />
<Compile Include="Rulesets\Edit\ToolboxGroup.cs" /> <Compile Include="Rulesets\Edit\ToolboxGroup.cs" />
<Compile Include="Rulesets\Judgements\DrawableJudgement.cs" /> <Compile Include="Rulesets\Judgements\DrawableJudgement.cs" />
<Compile Include="Rulesets\Judgements\Judgement.cs" /> <Compile Include="Rulesets\Judgements\Judgement.cs" />