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

Make the add tab item unselectable and toggle the channel list

Browse Source
This commit is contained in:
DrabWeb 2017-06-01 20:46:18 -03:00
parent 697fab9248
commit 62ada0afcb
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,13 +23,9 @@ namespace osu.Game.Overlays.Chat
protected override TabItem<Channel> CreateTabItem(Channel value) => new ChannelTabItem(value); protected override TabItem<Channel> CreateTabItem(Channel value) => new ChannelTabItem(value);
private const float shear_width = 10; private const float shear_width = 10;
private readonly Channel addChannel = new Channel { Name = "+" };
public readonly Bindable<bool> ChannelSelectorActive = new Bindable<bool>(); public readonly Bindable<bool> ChannelSelectorActive = new Bindable<bool>();
private Channel lastTab;
public Channel LastTab => lastTab;
public ChatTabControl() public ChatTabControl()
{ {
TabContainer.Margin = new MarginPadding { Left = 50 }; TabContainer.Margin = new MarginPadding { Left = 50 };
@ -45,12 +41,7 @@ namespace osu.Game.Overlays.Chat
Padding = new MarginPadding(10), Padding = new MarginPadding(10),
}); });
AddTabItem(new ChannelTabItem.ChannelSelectorTabItem(addChannel, ChannelSelectorActive)); AddTabItem(new ChannelTabItem.ChannelSelectorTabItem(new Channel { Name = "+" }, ChannelSelectorActive));
Current.ValueChanged += tab =>
{
if (tab != addChannel) lastTab = tab;
};
} }
private class ChannelTabItem : TabItem<Channel> private class ChannelTabItem : TabItem<Channel>
@ -216,11 +207,11 @@ namespace osu.Game.Overlays.Chat
{ {
public override bool Active public override bool Active
{ {
get { return base.Active; } get { return false; }
set set
{ {
activeBindable.Value = value; activeBindable.Value = !activeBindable.Value;
base.Active = value; base.Active = false;
} }
} }

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

@ -173,7 +173,6 @@ namespace osu.Game.Overlays
else else
{ {
inputTextBox.HoldFocus = true; inputTextBox.HoldFocus = true;
channelTabs.Current.Value = channelTabs.LastTab;
} }
}; };
} }