RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update TabControl in line with framework changes.

This commit is contained in:
Dean Herbert 2017-03-17 00:35:27 +09:00
parent 296a3cd1e9
commit e78bcf8739
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 53dfe2a110d732cca0e7df58c33eca368bc7ff61 Subproject commit db310bfc10cd1c9ed12c9e19cdc0edfa53117353

6
osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs
View File

@ -33,10 +33,10 @@ public override void Reset()
Position = new Vector2(275, 5) Position = new Vector2(275, 5)
}); });
filter.PinTab(GroupMode.All); filter.PinItem(GroupMode.All);
filter.PinTab(GroupMode.RecentlyPlayed); filter.PinItem(GroupMode.RecentlyPlayed);
filter.ValueChanged += (sender, mode) => filter.ItemChanged += (sender, mode) =>
{ {
text.Text = "Currently Selected: " + mode.ToString(); text.Text = "Currently Selected: " + mode.ToString();
}; };

2
osu.Game/Graphics/UserInterface/OsuTabControl.cs
View File

@ -28,7 +28,7 @@ public OsuTabControl()
throw new InvalidOperationException("OsuTabControl only supports enums as the generic type argument"); throw new InvalidOperationException("OsuTabControl only supports enums as the generic type argument");
foreach (var val in (T[])Enum.GetValues(typeof(T))) foreach (var val in (T[])Enum.GetValues(typeof(T)))
AddTab(val); AddItem(val);
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]

8
osu.Game/Screens/Select/FilterControl.cs
View File

@ -141,10 +141,10 @@ public FilterControl()
} }
}; };
groupTabs.PinTab(GroupMode.All); groupTabs.PinItem(GroupMode.All);
groupTabs.PinTab(GroupMode.RecentlyPlayed); groupTabs.PinItem(GroupMode.RecentlyPlayed);
groupTabs.ValueChanged += (sender, value) => Group = value; groupTabs.ItemChanged += (sender, value) => Group = value;
sortTabs.ValueChanged += (sender, value) => Sort = value; sortTabs.ItemChanged += (sender, value) => Sort = value;
} }
public void Deactivate() public void Deactivate()