sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into profile.

Browse Source
This commit is contained in:
Huo Yaoyuan
2017-06-15 02:31:51 +08:00
parent 78669a5941 df79fff996
commit ce67a28609
5 changed files with 36 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,21 +74,6 @@ namespace osu.Game.Graphics.UserInterface
}
}
public override bool Active
{
get { return base.Active; }
set
{
if (Active == value) return;
if (value)
fadeActive();
else
fadeInactive();
base.Active = value;
}
}
private const float transition_length = 500;
private void fadeActive()
@ -150,6 +135,10 @@ namespace osu.Game.Graphics.UserInterface
}
};
}
protected override void OnActivated() => fadeActive();
protected override void OnDeactivated() => fadeInactive();
}
private class OsuTabDropdown : OsuDropdown<T>

19
osu.Game/Graphics/UserInterface/PageTabControl.cs
View File

@ -31,21 +31,6 @@ namespace osu.Game.Graphics.UserInterface
protected readonly SpriteText Text;
public override bool Active
{
get { return base.Active; }
set
{
if (Active == value) return;
if (value)
slideActive();
else
slideInactive();
base.Active = value;
}
}
public PageTabItem(T value) : base(value)
{
AutoSizeAxes = Axes.X;
@ -102,6 +87,10 @@ namespace osu.Game.Graphics.UserInterface
{
box.ScaleTo(new Vector2(1f, 0f), transition_duration);
}
protected override void OnActivated() => slideActive();
protected override void OnDeactivated() => slideInactive();
}
}
}