mirror of
https://github.com/osukey/osukey.git
synced 2025-07-03 01:09:57 +09:00
Merge remote-tracking branch 'origin/master' into profile-header-update
# Conflicts: # osu-resources # osu.Game/Overlays/Profile/Components/GradeBadge.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/Header/RankGraph.cs # osu.Game/Overlays/Profile/Header/SupporterIcon.cs # osu.Game/Overlays/Profile/ProfileHeader.cs
This commit is contained in:
@ -124,16 +124,16 @@ namespace osu.Game.Overlays
|
||||
RelativeSizeAxes = Axes.Both
|
||||
}
|
||||
});
|
||||
sectionsContainer.SelectedSection.ValueChanged += s =>
|
||||
sectionsContainer.SelectedSection.ValueChanged += section =>
|
||||
{
|
||||
if (lastSection != s)
|
||||
if (lastSection != section.NewValue)
|
||||
{
|
||||
lastSection = s;
|
||||
lastSection = section.NewValue;
|
||||
tabs.Current.Value = lastSection;
|
||||
}
|
||||
};
|
||||
|
||||
tabs.Current.ValueChanged += s =>
|
||||
tabs.Current.ValueChanged += section =>
|
||||
{
|
||||
if (lastSection == null)
|
||||
{
|
||||
@ -142,9 +142,10 @@ namespace osu.Game.Overlays
|
||||
tabs.Current.Value = lastSection;
|
||||
return;
|
||||
}
|
||||
if (lastSection != s)
|
||||
|
||||
if (lastSection != section.NewValue)
|
||||
{
|
||||
lastSection = s;
|
||||
lastSection = section.NewValue;
|
||||
sectionsContainer.ScrollTo(lastSection);
|
||||
}
|
||||
};
|
||||
@ -210,7 +211,8 @@ namespace osu.Game.Overlays
|
||||
|
||||
private class ProfileTabItem : PageTabItem
|
||||
{
|
||||
public ProfileTabItem(ProfileSection value) : base(value)
|
||||
public ProfileTabItem(ProfileSection value)
|
||||
: base(value)
|
||||
{
|
||||
Text.Text = value.Title;
|
||||
}
|
||||
|
Reference in New Issue
Block a user