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

Add files to project, update with framework changes

Browse Source
This commit is contained in:
DrabWeb 2017-05-21 22:36:46 -03:00
parent 5a8a8acbc8
commit bc980b60ac
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Desktop.VisualTests/Tests/TestCaseMultiRoomPanel.cs
View File

@ -3,7 +3,6 @@
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework.Screens.Testing;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Screens.Select; using osu.Game.Screens.Select;
using osu.Game.Screens.Multiplayer; using osu.Game.Screens.Multiplayer;
@ -13,14 +12,15 @@ using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Framework.Testing;
namespace osu.Desktop.VisualTests.Tests namespace osu.Desktop.VisualTests.Tests
{ {
class TestCaseMultiRoomPanel : TestCase class TestCaseMultiRoomPanel : TestCase
{ {
private MultiRoomPanel test; private MultiRoomPanel test;
private FlowContainer panelContainer; private FillFlowContainer panelContainer;
public override string Name => @"MultiRoomPanel";
public override string Description => @"Select your favourite room"; public override string Description => @"Select your favourite room";
private void action(int action) private void action(int action)
@ -37,14 +37,14 @@ namespace osu.Desktop.VisualTests.Tests
{ {
base.Reset(); base.Reset();
AddButton(@"ChangeState", () => action(0)); AddStep(@"ChangeState", () => action(0));
Add(panelContainer = new FlowContainer //Positionning container Add(panelContainer = new FillFlowContainer //Positionning container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Direction = FlowDirections.Vertical, Direction = FillDirection.Vertical,
Size = new Vector2(0.4f, 0.5f), Size = new Vector2(0.4f, 0.5f),
Children = new Drawable[] Children = new Drawable[]
{ {

1
osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
View File

@ -217,6 +217,7 @@
<Compile Include="Tests\TestCaseLeaderboard.cs" /> <Compile Include="Tests\TestCaseLeaderboard.cs" />
<Compile Include="Beatmaps\TestWorkingBeatmap.cs" /> <Compile Include="Beatmaps\TestWorkingBeatmap.cs" />
<Compile Include="Tests\TestCaseBeatmapDetailArea.cs" /> <Compile Include="Tests\TestCaseBeatmapDetailArea.cs" />
<Compile Include="Tests\TestCaseMultiRoomPanel.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />
<ItemGroup /> <ItemGroup />

14
osu.Game/Screens/Multiplayer/MultiRoomPanel.cs
View File

@ -4,12 +4,12 @@
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework; using osu.Framework;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds; using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
@ -132,12 +132,12 @@ namespace osu.Game.Screens.Multiplayer
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
} }
, ,
new FlowContainer new FillFlowContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Direction = FlowDirections.Vertical, Direction = FillDirection.Vertical,
Size = new Vector2(0.75f,1), Size = new Vector2(0.75f,1),
Children = new Drawable[] Children = new Drawable[]
@ -148,11 +148,11 @@ namespace osu.Game.Screens.Multiplayer
TextSize = 18, TextSize = 18,
Margin = new MarginPadding { Top = CONTENT_PADDING }, Margin = new MarginPadding { Top = CONTENT_PADDING },
}, },
new FlowContainer new FillFlowContainer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = 20, Height = 20,
Direction = FlowDirections.Horizontal, Direction = FillDirection.Horizontal,
Spacing = new Vector2(5,0), Spacing = new Vector2(5,0),
Children = new Drawable[] Children = new Drawable[]
{ {
@ -225,10 +225,10 @@ namespace osu.Game.Screens.Multiplayer
Colour = statusColour, Colour = statusColour,
Margin = new MarginPadding { Top = 10 } Margin = new MarginPadding { Top = 10 }
}, },
new FlowContainer new FillFlowContainer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Direction = FlowDirections.Horizontal, Direction = FillDirection.Horizontal,
Children = new Drawable[] Children = new Drawable[]
{ {
new OsuSpriteText new OsuSpriteText

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

@ -427,6 +427,7 @@
<Compile Include="Overlays\Music\PlaylistOverlay.cs" /> <Compile Include="Overlays\Music\PlaylistOverlay.cs" />
<Compile Include="Rulesets\Replays\IAutoGenerator.cs" /> <Compile Include="Rulesets\Replays\IAutoGenerator.cs" />
<Compile Include="Rulesets\Replays\AutoGenerator.cs" /> <Compile Include="Rulesets\Replays\AutoGenerator.cs" />
<Compile Include="Screens\Multiplayer\MultiRoomPanel.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj"> <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">