h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 06:23:20 +08:00
Code Issues Releases Wiki Activity

Merge pull request #496 from peppy/tab-control-documentation

Browse Source 
Update TabControl in line with framework changes.
This commit is contained in:
Dan Balasescu 2017-03-17 00:51:01 +09:00 committed by GitHub
commit e2f521220a
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 @@ namespace osu.Desktop.VisualTests.Tests
Position = new Vector2(275, 5)
});
filter.PinTab(GroupMode.All);
filter.PinTab(GroupMode.RecentlyPlayed);
filter.PinItem(GroupMode.All);
filter.PinItem(GroupMode.RecentlyPlayed);
filter.ValueChanged += (sender, mode) =>
filter.ItemChanged += (sender, mode) =>
{
text.Text = "Currently Selected: " + mode.ToString();
};

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

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

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

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