1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 14:37:30 +08:00

Move search box to the top, remove redundant heading, and use existing search box

This commit is contained in:
Bartłomiej Dach 2024-10-22 11:27:45 +02:00
parent 17cd411567
commit 256d8c6559
No known key found for this signature in database

View File

@ -18,6 +18,7 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Chat; using osu.Game.Online.Chat;
using osu.Game.Overlays.Chat.Listing; using osu.Game.Overlays.Chat.Listing;
using osu.Game.Resources.Localisation.Web; using osu.Game.Resources.Localisation.Web;
using osuTK;
namespace osu.Game.Overlays.Chat.ChannelList namespace osu.Game.Overlays.Chat.ChannelList
{ {
@ -65,32 +66,21 @@ namespace osu.Game.Overlays.Chat.ChannelList
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Children = new Drawable[] Children = new Drawable[]
{ {
announceChannelGroup = new ChannelGroup(ChatStrings.ChannelsListTitleANNOUNCE.ToUpper()), new Container
publicChannelGroup = new ChannelGroup(ChatStrings.ChannelsListTitlePUBLIC.ToUpper()),
selector = new ChannelListItem(ChannelListingChannel),
new FillFlowContainer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Padding = new MarginPadding { Horizontal = 18, Top = 8 }, Padding = new MarginPadding { Horizontal = 10, Top = 8 },
Direction = FillDirection.Vertical, Child = searchTextBox = new BasicSearchTextBox
Children = new Drawable[]
{ {
new OsuSpriteText RelativeSizeAxes = Axes.X,
{ Scale = new Vector2(0.8f),
Text = "SEARCH", Width = 1 / 0.8f,
Margin = new MarginPadding { Bottom = 5 },
Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
},
searchTextBox = new OsuTextBox
{
Height = 28,
RelativeSizeAxes = Axes.X,
PlaceholderText = "Search by name...",
FontSize = 14,
}
} }
}, },
announceChannelGroup = new ChannelGroup(ChatStrings.ChannelsListTitleANNOUNCE.ToUpper()),
publicChannelGroup = new ChannelGroup(ChatStrings.ChannelsListTitlePUBLIC.ToUpper()),
selector = new ChannelListItem(ChannelListingChannel),
privateChannelGroup = new ChannelGroup(ChatStrings.ChannelsListTitlePM.ToUpper()), privateChannelGroup = new ChannelGroup(ChatStrings.ChannelsListTitlePM.ToUpper()),
}, },
}, },