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

ChatConsole -> ChatOverlay. Namespace tidying.

Browse Source
This commit is contained in:
Dean Herbert 2016-11-30 15:15:43 +09:00
parent 34e91c8474
commit 18509e6a60
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
View File

@ -14,9 +14,9 @@ using osu.Game;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
using osu.Game.Online.Chat; using osu.Game.Online.Chat;
using osu.Game.Online.Chat.Display;
using OpenTK; using OpenTK;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Game.Online.Chat.Drawables;
namespace osu.Desktop.VisualTests.Tests namespace osu.Desktop.VisualTests.Tests
{ {

6
osu.Game/Online/Chat/Display/ChannelDisplay.cs → osu.Game/Online/Chat/Drawables/ChannelDisplay.cs
View File

@ -4,15 +4,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations;
using OpenTK; using OpenTK;
using osu.Framework;
using osu.Framework.Allocation;
namespace osu.Game.Online.Chat.Display namespace osu.Game.Online.Chat.Drawables
{ {
public class ChannelDisplay : Container public class ChannelDisplay : Container
{ {

2
osu.Game/Online/Chat/Display/ChatLine.cs → osu.Game/Online/Chat/Drawables/ChatLine.cs
View File

@ -8,7 +8,7 @@ using osu.Framework.Graphics.Sprites;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
namespace osu.Game.Online.Chat.Display namespace osu.Game.Online.Chat.Drawables
{ {
public class ChatLine : Container public class ChatLine : Container
{ {

4
osu.Game/OsuGame.cs
View File

@ -30,7 +30,7 @@ namespace osu.Game
{ {
public Toolbar Toolbar; public Toolbar Toolbar;
private ChatConsole chat; private ChatOverlay chat;
private MusicController musicController; private MusicController musicController;
@ -115,7 +115,7 @@ namespace osu.Game
}); });
//overlay elements //overlay elements
(chat = new ChatConsole(API) { Depth = 0 }).Preload(this, overlayContent.Add); (chat = new ChatOverlay { Depth = 0 }).Preload(this, overlayContent.Add);
(Options = new OptionsOverlay { Depth = -1 }).Preload(this, overlayContent.Add); (Options = new OptionsOverlay { Depth = -1 }).Preload(this, overlayContent.Add);
(musicController = new MusicController() { Depth = -3 }).Preload(this, overlayContent.Add); (musicController = new MusicController() { Depth = -3 }).Preload(this, overlayContent.Add);
(Toolbar = new Toolbar (Toolbar = new Toolbar

12
osu.Game/Overlays/ChatConsole.cs → osu.Game/Overlays/ChatOverlay.cs
View File

@ -6,7 +6,6 @@ using System.Diagnostics;
using System.Linq; using System.Linq;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -16,11 +15,11 @@ using osu.Framework.Threading;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
using osu.Game.Online.Chat; using osu.Game.Online.Chat;
using osu.Game.Online.Chat.Display; using osu.Game.Online.Chat.Drawables;
namespace osu.Game.Overlays namespace osu.Game.Overlays
{ {
public class ChatConsole : OverlayContainer public class ChatOverlay : OverlayContainer, IOnlineComponent
{ {
private ChannelDisplay channelDisplay; private ChannelDisplay channelDisplay;
@ -32,7 +31,7 @@ namespace osu.Game.Overlays
private APIAccess api; private APIAccess api;
public ChatConsole() public ChatOverlay()
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Size = new Vector2(1, 300); Size = new Vector2(1, 300);
@ -148,5 +147,10 @@ namespace osu.Game.Overlays
MoveToY(DrawSize.Y, transition_length, EasingTypes.InSine); MoveToY(DrawSize.Y, transition_length, EasingTypes.InSine);
FadeOut(transition_length, EasingTypes.InSine); FadeOut(transition_length, EasingTypes.InSine);
} }
public void APIStateChanged(APIAccess api, APIState state)
{
throw new System.NotImplementedException();
}
} }
} }

6
osu.Game/osu.Game.csproj
View File

@ -151,13 +151,13 @@
<Compile Include="Online\API\SecurePassword.cs" /> <Compile Include="Online\API\SecurePassword.cs" />
<Compile Include="Online\API\Requests\ListChannels.cs" /> <Compile Include="Online\API\Requests\ListChannels.cs" />
<Compile Include="Online\Chat\Channel.cs" /> <Compile Include="Online\Chat\Channel.cs" />
<Compile Include="Online\Chat\Display\ChannelDisplay.cs" /> <Compile Include="Online\Chat\Drawables\ChannelDisplay.cs" />
<Compile Include="Online\Chat\Display\ChatLine.cs" /> <Compile Include="Online\Chat\Drawables\ChatLine.cs" />
<Compile Include="Online\Chat\Message.cs" /> <Compile Include="Online\Chat\Message.cs" />
<Compile Include="Online\User.cs" /> <Compile Include="Online\User.cs" />
<Compile Include="OsuGame.cs" /> <Compile Include="OsuGame.cs" />
<Compile Include="OsuGameBase.cs" /> <Compile Include="OsuGameBase.cs" />
<Compile Include="Overlays\ChatConsole.cs" /> <Compile Include="Overlays\ChatOverlay.cs" />
<Compile Include="Overlays\OptionsOverlay.cs" /> <Compile Include="Overlays\OptionsOverlay.cs" />
<Compile Include="Overlays\Toolbar.cs" /> <Compile Include="Overlays\Toolbar.cs" />
<Compile Include="Overlays\ToolbarButton.cs" /> <Compile Include="Overlays\ToolbarButton.cs" />