Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BreadcrumbControl design adjustments #2518

Merged
merged 2 commits into from May 11, 2018
Merged

BreadcrumbControl design adjustments #2518

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecb8de2
Adjust BreadcrumbControl to better match the designs.
DrabWeb May 10, 2018
2afc0c1
Merge branch 'master' into breadcrumb-design-adjustments
peppy May 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 12 additions & 6 deletions osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
View file
Open in desktop
Expand Up @@ -14,14 +14,18 @@ namespace osu.Game.Graphics.UserInterface
public class BreadcrumbControl<T> : OsuTabControl<T>
{
private const float padding = 10;
private const float item_chevron_size = 10;

protected override TabItem<T> CreateTabItem(T value) => new BreadcrumbTabItem(value);
protected override TabItem<T> CreateTabItem(T value) => new BreadcrumbTabItem(value)
{
AccentColour = AccentColour,
};

protected override float StripWidth() => base.StripWidth() - (padding + 8);
protected override float StripWidth() => base.StripWidth() - (padding + item_chevron_size);

public BreadcrumbControl()
{
Height = 26;
Height = 32;
TabContainer.Spacing = new Vector2(padding, 0f);
Current.ValueChanged += tab =>
{
Expand All @@ -47,6 +51,7 @@ private class BreadcrumbTabItem : OsuTabItem, IStateful<Visibility>

public override bool HandleKeyboardInput => State == Visibility.Visible;
public override bool HandleMouseInput => State == Visibility.Visible;
public override bool IsRemovable => true;

private Visibility state;

Expand Down Expand Up @@ -77,13 +82,14 @@ public Visibility State

public BreadcrumbTabItem(T value) : base(value)
{
Text.TextSize = 16;
Padding = new MarginPadding { Right = padding + 8 }; //padding + chevron width
Text.TextSize = 18;
Text.Margin = new MarginPadding { Vertical = 8 };
Padding = new MarginPadding { Right = padding + item_chevron_size };
Add(Chevron = new SpriteIcon
{
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreLeft,
Size = new Vector2(12),
Size = new Vector2(item_chevron_size),
Icon = FontAwesome.fa_chevron_right,
Margin = new MarginPadding { Left = padding },
Alpha = 0f,
Expand Down