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

Clear messages when the current channel is removed.

Browse Source 
- Stop using TabContainer.Children
This commit is contained in:
naoey 2017-08-17 08:20:44 +05:30
parent 381c709639
commit 4f7ae1ed8b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/Chat/ChatTabControl.cs
View File

@ -82,12 +82,12 @@ namespace osu.Game.Overlays.Chat
private void onTabClose(TabItem<Channel> tab) private void onTabClose(TabItem<Channel> tab)
{ {
int totalTabs = TabContainer.Children.Count - 1; // account for selectorTab int totalTabs = TabContainer.Count - 1; // account for selectorTab
int currentIndex = MathHelper.Clamp(TabContainer.IndexOf(tab), 1, totalTabs); int currentIndex = MathHelper.Clamp(TabContainer.IndexOf(tab), 1, totalTabs);
if (tab == SelectedTab && totalTabs > 1) if (tab == SelectedTab && totalTabs > 1)
// Select the tab after tab-to-be-removed's index, or the tab before if current == last // Select the tab after tab-to-be-removed's index, or the tab before if current == last
SelectTab(TabContainer.Children[currentIndex == totalTabs ? currentIndex - 1 : currentIndex + 1]); SelectTab(TabContainer[currentIndex == totalTabs ? currentIndex - 1 : currentIndex + 1]);
else if (totalTabs == 1 && !selectorTab.Active) else if (totalTabs == 1 && !selectorTab.Active)
// Open channel selection overlay if all channel tabs will be closed after removing this tab // Open channel selection overlay if all channel tabs will be closed after removing this tab
SelectTab(selectorTab); SelectTab(selectorTab);

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

@ -397,7 +397,11 @@ namespace osu.Game.Overlays
{ {
if (channel == null) return; if (channel == null) return;
if (channel == CurrentChannel)
currentChannelContainer.Clear(false);
careChannels.Remove(channel); careChannels.Remove(channel);
loadedChannels.Remove(loadedChannels.Find(c => c.Channel == channel));
channelTabs.RemoveItem(channel); channelTabs.RemoveItem(channel);
channel.Joined.Value = false; channel.Joined.Value = false;