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

Remove selectorActive bindable completely

Browse Source
This commit is contained in:
Dean Herbert 2022-05-12 13:53:57 +09:00
parent c45e8f619b
commit 2dfed6eda1
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
osu.Game/Overlays/ChatOverlayV2.cs
View File

@ -50,8 +50,6 @@ namespace osu.Game.Overlays
private const float side_bar_width = 190;
private const float chat_bar_height = 60;
private readonly BindableBool selectorActive = new BindableBool();
[Resolved]
private OsuConfigManager config { get; set; } = null!;
@ -136,7 +134,6 @@ namespace osu.Game.Overlays
Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight,
Padding = new MarginPadding { Left = side_bar_width },
ShowSearch = { BindTarget = selectorActive },
},
};
}
@ -145,8 +142,6 @@ namespace osu.Game.Overlays
{
base.LoadComplete();
loading.Show();
config.BindWith(OsuSetting.ChatDisplayHeight, chatHeight);
chatHeight.BindValueChanged(height => { Height = height.NewValue; }, true);
@ -164,8 +159,6 @@ namespace osu.Game.Overlays
textBar.OnSearchTermsChanged += searchTerms => channelListing.SearchTerm = searchTerms;
textBar.OnChatMessageCommitted += handleChatMessage;
selectorActive.BindValueChanged(v => channelListing.State.Value = v.NewValue ? Visibility.Visible : Visibility.Hidden, true);
}
/// <summary>
@ -244,22 +237,25 @@ namespace osu.Game.Overlays
{
Channel? newChannel = channel.NewValue;
loading.Show();
if (newChannel == null)
{
selectorActive.Value = true;
return;
// null channel denotes that we should be showing the listing.
channelListing.State.Value = Visibility.Visible;
textBar.ShowSearch.Value = true;
}
selectorActive.Value = false;
LoadComponentAsync(new DrawableChannel(newChannel), loaded =>
else
{
currentChannelContainer.Clear();
currentChannelContainer.Add(loaded);
loading.Hide();
});
channelListing.State.Value = Visibility.Hidden;
textBar.ShowSearch.Value = false;
loading.Show();
LoadComponentAsync(new DrawableChannel(newChannel), loaded =>
{
currentChannelContainer.Clear();
currentChannelContainer.Add(loaded);
loading.Hide();
});
}
}
private void joinedChannelsChanged(object sender, NotifyCollectionChangedEventArgs args)