sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename all DropDown -> Dropdown.

Browse Source
This commit is contained in:
Huo Yaoyuan
2017-03-22 22:32:32 +08:00
parent 6a4ca08578
commit 0dbc232ebf
15 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Graphics/UserInterface/OsuDropDown.cs → osu.Game/Graphics/UserInterface/OsuDropdown.cs
View File

@ -8,9 +8,9 @@ using osu.Framework.Graphics.UserInterface;
namespace osu.Game.Graphics.UserInterface
{
public class OsuDropDown<T> : DropDown<T>
public class OsuDropdown<T> : Dropdown<T>
{
protected override DropDownHeader CreateHeader() => new OsuDropDownHeader { AccentColour = AccentColour };
protected override DropdownHeader CreateHeader() => new OsuDropdownHeader { AccentColour = AccentColour };
protected override Menu CreateMenu() => new OsuMenu();
@ -22,8 +22,8 @@ namespace osu.Game.Graphics.UserInterface
{
accentColour = value;
if (Header != null)
((OsuDropDownHeader)Header).AccentColour = value;
foreach (var item in MenuItems.OfType<OsuDropDownMenuItem<T>>())
((OsuDropdownHeader)Header).AccentColour = value;
foreach (var item in MenuItems.OfType<OsuDropdownMenuItem<T>>())
item.AccentColour = value;
}
}
@ -35,6 +35,6 @@ namespace osu.Game.Graphics.UserInterface
AccentColour = colours.PinkDarker;
}
protected override DropDownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropDownMenuItem<T>(text, value) { AccentColour = AccentColour };
protected override DropdownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropdownMenuItem<T>(text, value) { AccentColour = AccentColour };
}
}

4
osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs → osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs
View File

@ -12,7 +12,7 @@ using osu.Framework.Extensions.Color4Extensions;
namespace osu.Game.Graphics.UserInterface
{
public class OsuDropDownHeader : DropDownHeader
public class OsuDropdownHeader : DropdownHeader
{
private SpriteText label;
protected override string Label
@ -32,7 +32,7 @@ namespace osu.Game.Graphics.UserInterface
}
}
public OsuDropDownHeader()
public OsuDropdownHeader()
{
Foreground.Padding = new MarginPadding(4);

4
osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs → osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs
View File

@ -12,9 +12,9 @@ using OpenTK.Graphics;
namespace osu.Game.Graphics.UserInterface
{
public class OsuDropDownMenuItem<U> : DropDownMenuItem<U>
public class OsuDropdownMenuItem<T> : DropdownMenuItem<T>
{
public OsuDropDownMenuItem(string text, U value) : base(text, value)
public OsuDropdownMenuItem(string text, T value) : base(text, value)
{
Foreground.Padding = new MarginPadding(2);

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

@ -16,11 +16,11 @@ namespace osu.Game.Graphics.UserInterface
{
public class OsuTabControl<T> : TabControl<T>
{
protected override DropDown<T> CreateDropDown() => new OsuTabDropDown();
protected override Dropdown<T> CreateDropdown() => new OsuTabDropdown();
protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem<T> { Value = value };
protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || DropDown.Contains(screenSpacePos);
protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || Dropdown.Contains(screenSpacePos);
public OsuTabControl()
{
@ -45,7 +45,7 @@ namespace osu.Game.Graphics.UserInterface
set
{
accentColour = value;
var dropDown = DropDown as OsuTabDropDown;
var dropDown = Dropdown as OsuTabDropdown;
if (dropDown != null)
dropDown.AccentColour = value;
foreach (var item in TabContainer.Children.OfType<OsuTabItem<T>>())
@ -53,34 +53,34 @@ namespace osu.Game.Graphics.UserInterface
}
}
public class OsuTabDropDown : OsuDropDown<T>
public class OsuTabDropdown : OsuDropdown<T>
{
protected override DropDownHeader CreateHeader() => new OsuTabDropDownHeader
protected override DropdownHeader CreateHeader() => new OsuTabDropdownHeader
{
AccentColour = AccentColour,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
};
protected override DropDownMenuItem<T> CreateMenuItem(string text, T value)
protected override DropdownMenuItem<T> CreateMenuItem(string text, T value)
{
var item = base.CreateMenuItem(text, value);
item.ForegroundColourHover = Color4.Black;
return item;
}
public OsuTabDropDown()
public OsuTabDropdown()
{
DropDownMenu.Anchor = Anchor.TopRight;
DropDownMenu.Origin = Anchor.TopRight;
DropdownMenu.Anchor = Anchor.TopRight;
DropdownMenu.Origin = Anchor.TopRight;
RelativeSizeAxes = Axes.X;
DropDownMenu.Background.Colour = Color4.Black.Opacity(0.7f);
DropDownMenu.MaxHeight = 400;
DropdownMenu.Background.Colour = Color4.Black.Opacity(0.7f);
DropdownMenu.MaxHeight = 400;
}
public class OsuTabDropDownHeader : OsuDropDownHeader
public class OsuTabDropdownHeader : OsuDropdownHeader
{
public override Color4 AccentColour
{
@ -104,7 +104,7 @@ namespace osu.Game.Graphics.UserInterface
base.OnHoverLost(state);
}
public OsuTabDropDownHeader()
public OsuTabDropdownHeader()
{
RelativeSizeAxes = Axes.None;
AutoSizeAxes = Axes.X;