sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Padding below channel list, remove text shadows, fix search box focusing

Browse Source
This commit is contained in:
DrabWeb
2017-05-20 21:38:36 -03:00
parent a60d1efc21
commit 51bc3dfe72
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Overlays/Chat/ChannelListItem.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 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 System; using System;
@ -82,6 +82,7 @@ namespace osu.Game.Overlays.Chat
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Icon = FontAwesome.fa_check_circle, Icon = FontAwesome.fa_check_circle,
TextSize = text_size, TextSize = text_size,
Shadow = false,
Margin = new MarginPadding { Right = 10f }, Margin = new MarginPadding { Right = 10f },
Alpha = 0f, Alpha = 0f,
}, },
@ -97,6 +98,7 @@ namespace osu.Game.Overlays.Chat
{ {
TextSize = text_size, TextSize = text_size,
Font = @"Exo2.0-Bold", Font = @"Exo2.0-Bold",
Shadow = false,
}, },
}, },
}, },
@ -111,6 +113,7 @@ namespace osu.Game.Overlays.Chat
{ {
TextSize = text_size, TextSize = text_size,
Font = @"Exo2.0-SemiBold", Font = @"Exo2.0-SemiBold",
Shadow = false,
Alpha = 0.8f, Alpha = 0.8f,
}, },
}, },
@ -127,6 +130,7 @@ namespace osu.Game.Overlays.Chat
{ {
Icon = FontAwesome.fa_user, Icon = FontAwesome.fa_user,
TextSize = text_size - 2, TextSize = text_size - 2,
Shadow = false,
Margin = new MarginPadding { Top = 1 }, Margin = new MarginPadding { Top = 1 },
}, },
new OsuSpriteText new OsuSpriteText
@ -134,6 +138,7 @@ namespace osu.Game.Overlays.Chat
Text = @"0", Text = @"0",
TextSize = text_size, TextSize = text_size,
Font = @"Exo2.0-SemiBold", Font = @"Exo2.0-SemiBold",
Shadow = false,
}, },
}, },
}, },

11
osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 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 System; using System;
@ -21,7 +21,7 @@ using osu.Game.Online.Chat;
namespace osu.Game.Overlays.Chat namespace osu.Game.Overlays.Chat
{ {
public class ChannelSelectionOverlay : FocusedOverlayContainer public class ChannelSelectionOverlay : OverlayContainer
{ {
public static readonly float WIDTH_PADDING = 170; public static readonly float WIDTH_PADDING = 170;
@ -87,7 +87,7 @@ namespace osu.Game.Overlays.Chat
LayoutDuration = 200, LayoutDuration = 200,
LayoutEasing = EasingTypes.OutQuint, LayoutEasing = EasingTypes.OutQuint,
Spacing = new Vector2(0f, 20f), Spacing = new Vector2(0f, 20f),
Padding = new MarginPadding { Top = 20, Left = WIDTH_PADDING, Right = WIDTH_PADDING }, Padding = new MarginPadding { Top = 20, Bottom = 20, Left = WIDTH_PADDING, Right = WIDTH_PADDING },
}, },
}, },
}, },
@ -114,6 +114,7 @@ namespace osu.Game.Overlays.Chat
{ {
Text = @"Chat Channels", Text = @"Chat Channels",
TextSize = 20, TextSize = 20,
Shadow = false,
}, },
search = new HeaderSearchTextBox search = new HeaderSearchTextBox
{ {
@ -146,8 +147,6 @@ namespace osu.Game.Overlays.Chat
protected override void PopIn() protected override void PopIn()
{ {
base.PopIn();
search.HoldFocus = true; search.HoldFocus = true;
Schedule(() => search.TriggerFocus()); Schedule(() => search.TriggerFocus());
@ -157,8 +156,6 @@ namespace osu.Game.Overlays.Chat
protected override void PopOut() protected override void PopOut()
{ {
base.PopOut();
search.HoldFocus = false; search.HoldFocus = false;
FadeOut(500, EasingTypes.InQuint); FadeOut(500, EasingTypes.InQuint);