mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 23:12:56 +08:00
Fix chat being dismissed in test scene when it shouldn't
This commit is contained in:
parent
554b451e04
commit
6c5599f874
@ -1,45 +0,0 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
||||||
// See the LICENCE file in the repository root for full licence text.
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using osu.Framework.Allocation;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Framework.Graphics.Containers;
|
|
||||||
using osu.Game.Online.Chat;
|
|
||||||
using osu.Game.Overlays;
|
|
||||||
using osu.Game.Overlays.Chat;
|
|
||||||
using osu.Game.Overlays.Chat.Tabs;
|
|
||||||
|
|
||||||
namespace osu.Game.Tests.Visual.Online
|
|
||||||
{
|
|
||||||
[Description("Testing chat api and overlay")]
|
|
||||||
public class TestSceneChatDisplay : OsuTestScene
|
|
||||||
{
|
|
||||||
public override IReadOnlyList<Type> RequiredTypes => new[]
|
|
||||||
{
|
|
||||||
typeof(ChatOverlay),
|
|
||||||
typeof(ChatLine),
|
|
||||||
typeof(DrawableChannel),
|
|
||||||
typeof(ChannelSelectorTabItem),
|
|
||||||
typeof(ChannelTabControl),
|
|
||||||
typeof(ChannelTabItem),
|
|
||||||
typeof(PrivateChannelTabItem),
|
|
||||||
typeof(TabCloseButton)
|
|
||||||
};
|
|
||||||
|
|
||||||
[Cached]
|
|
||||||
private readonly ChannelManager channelManager = new ChannelManager();
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load()
|
|
||||||
{
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
channelManager,
|
|
||||||
new ChatOverlay { State = { Value = Visibility.Visible } }
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -171,7 +171,7 @@ namespace osu.Game.Overlays
|
|||||||
channelTabControl.ChannelSelectorActive.ValueChanged += active => channelSelectionOverlay.State.Value = active.NewValue ? Visibility.Visible : Visibility.Hidden;
|
channelTabControl.ChannelSelectorActive.ValueChanged += active => channelSelectionOverlay.State.Value = active.NewValue ? Visibility.Visible : Visibility.Hidden;
|
||||||
channelSelectionOverlay.State.ValueChanged += state =>
|
channelSelectionOverlay.State.ValueChanged += state =>
|
||||||
{
|
{
|
||||||
if (state.NewValue == Visibility.Hidden && channelManager.CurrentChannel.Value == null)
|
if (state.NewValue == Visibility.Hidden && channelManager.JoinedChannels.Count == 0)
|
||||||
{
|
{
|
||||||
channelSelectionOverlay.Show();
|
channelSelectionOverlay.Show();
|
||||||
Hide();
|
Hide();
|
||||||
|
Loading…
Reference in New Issue
Block a user