h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 20:22:55 +08:00
Code Issues Releases Wiki Activity

Move drawable chat related classes to better namespace

Browse Source
This commit is contained in:
Dean Herbert 2017-05-12 14:21:57 +09:00
parent 9cf4998701
commit c4a93cbc85
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Online/Chat/Drawables/ChatLine.cs → osu.Game/Overlays/Chat/ChatLine.cs
View File

@ -6,10 +6,11 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Online.Chat.Drawables
namespace osu.Game.Overlays.Chat
{
public class ChatLine : Container
{
@ -62,7 +63,10 @@ namespace osu.Game.Online.Chat.Drawables
return username_colours[message.UserId % username_colours.Length];
}
private const float padding = 200;
public const float LEFT_PADDING = message_padding + padding * 2;
private const float padding = 15;
private const float message_padding = 200;
private const float text_size = 20;
public ChatLine(Message message)
@ -72,13 +76,13 @@ namespace osu.Game.Online.Chat.Drawables
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
Padding = new MarginPadding { Left = 15, Right = 15 };
Padding = new MarginPadding { Left = padding, Right = padding };
Children = new Drawable[]
{
new Container
{
Size = new Vector2(padding, text_size),
Size = new Vector2(message_padding, text_size),
Children = new Drawable[]
{
new OsuSpriteText
@ -106,7 +110,7 @@ namespace osu.Game.Online.Chat.Drawables
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = new MarginPadding { Left = padding + 15 },
Padding = new MarginPadding { Left = message_padding + padding },
Children = new Drawable[]
{
new OsuSpriteText

3
osu.Game/Online/Chat/Drawables/DrawableChannel.cs → osu.Game/Overlays/Chat/DrawableChannel.cs
View File

@ -7,8 +7,9 @@ using System.Linq;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Game.Online.Chat;
namespace osu.Game.Online.Chat.Drawables
namespace osu.Game.Overlays.Chat
{
public class DrawableChannel : Container
{

3
osu.Game/Overlays/ChatOverlay.cs
View File

@ -16,13 +16,14 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Online.Chat;
using osu.Game.Online.Chat.Drawables;
using osu.Game.Graphics.UserInterface;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.UserInterface;
using OpenTK.Graphics;
using osu.Framework.Input;
using osu.Game.Configuration;
using osu.Game.Graphics;
using osu.Game.Overlays.Chat;
namespace osu.Game.Overlays
{

4
osu.Game/osu.Game.csproj
View File

@ -304,8 +304,8 @@
<Compile Include="Online\API\Requests\GetMessagesRequest.cs" />
<Compile Include="Online\API\Requests\ListChannelsRequest.cs" />
<Compile Include="Online\Chat\Channel.cs" />
<Compile Include="Online\Chat\Drawables\DrawableChannel.cs" />
<Compile Include="Online\Chat\Drawables\ChatLine.cs" />
<Compile Include="Overlays\Chat\DrawableChannel.cs" />
<Compile Include="Overlays\Chat\ChatLine.cs" />
<Compile Include="Online\Chat\Message.cs" />
<Compile Include="OsuGame.cs" />
<Compile Include="OsuGameBase.cs" />