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

Update with framework bindable changes

Browse Source
This commit is contained in:
smoogipoo
2019-02-21 18:56:34 +09:00
parent d637b184e4
commit bca347427f
195 changed files with 567 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,8 +162,8 @@ namespace osu.Game.Overlays
},
};
channelTabControl.Current.ValueChanged += chat => channelManager.CurrentChannel.Value = chat;
channelTabControl.ChannelSelectorActive.ValueChanged += value => channelSelectionOverlay.State = value ? Visibility.Visible : Visibility.Hidden;
channelTabControl.Current.ValueChanged += e => channelManager.CurrentChannel.Value = e.NewValue;
channelTabControl.ChannelSelectorActive.ValueChanged += e => channelSelectionOverlay.State = e.NewValue ? Visibility.Visible : Visibility.Hidden;
channelSelectionOverlay.StateChanged += state =>
{
if (state == Visibility.Hidden && channelManager.CurrentChannel.Value == null)
@ -189,9 +189,9 @@ namespace osu.Game.Overlays
channelSelectionOverlay.OnRequestLeave = channel => channelManager.LeaveChannel(channel);
}
private void currentChannelChanged(Channel channel)
private void currentChannelChanged(ValueChangedEvent<Channel> e)
{
if (channel == null)
if (e.NewValue == null)
{
textbox.Current.Disabled = true;
currentChannelContainer.Clear(false);
@ -199,18 +199,18 @@ namespace osu.Game.Overlays
return;
}
textbox.Current.Disabled = channel.ReadOnly;
textbox.Current.Disabled = e.NewValue.ReadOnly;
if (channelTabControl.Current.Value != channel)
Scheduler.Add(() => channelTabControl.Current.Value = channel);
if (channelTabControl.Current.Value != e.NewValue)
Scheduler.Add(() => channelTabControl.Current.Value = e.NewValue);
var loaded = loadedChannels.Find(d => d.Channel == channel);
var loaded = loadedChannels.Find(d => d.Channel == e.NewValue);
if (loaded == null)
{
currentChannelContainer.FadeOut(500, Easing.OutQuint);
loading.Show();
loaded = new DrawableChannel(channel);
loaded = new DrawableChannel(e.NewValue);
loadedChannels.Add(loaded);
LoadComponentAsync(loaded, l =>
{
@ -328,11 +328,11 @@ namespace osu.Game.Overlays
private void load(OsuConfigManager config, OsuColour colours, ChannelManager channelManager)
{
ChatHeight = config.GetBindable<double>(OsuSetting.ChatDisplayHeight);
ChatHeight.ValueChanged += h =>
ChatHeight.ValueChanged += e =>
{
chatContainer.Height = (float)h;
channelSelectionContainer.Height = 1f - (float)h;
tabBackground.FadeTo(h == 1 ? 1 : 0.8f, 200);
chatContainer.Height = (float)e.NewValue;
channelSelectionContainer.Height = 1f - (float)e.NewValue;
tabBackground.FadeTo(e.NewValue == 1 ? 1 : 0.8f, 200);
};
ChatHeight.TriggerChange();