h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-19 11:57:45 +08:00
Code Issues Releases Wiki Activity

Merge pull request #152 from SirCmpwn/options-sidebar-tracking

Browse Source 
Track the visible section in options
This commit is contained in:
Thomas Müller 2016-11-12 14:35:00 +01:00 committed by GitHub
commit be319707cf
4 changed files with 148 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
osu.Game/Overlays/Options/OptionsSidebar.cs
View File

@ -71,79 +71,5 @@ namespace osu.Game.Overlays.Options
Content.Origin = Anchor.CentreLeft;
}
}
public class SidebarButton : Container
{
private TextAwesome drawableIcon;
private SpriteText headerText;
private Box backgroundBox;
public Action Action;
public FontAwesome Icon
{
get { return drawableIcon.Icon; }
set { drawableIcon.Icon = value; }
}
public string Header
{
get { return headerText.Text; }
set { headerText.Text = value; }
}
public SidebarButton()
{
Height = default_width;
RelativeSizeAxes = Axes.X;
Children = new Drawable[]
{
backgroundBox = new Box
{
RelativeSizeAxes = Axes.Both,
BlendingMode = BlendingMode.Additive,
Colour = new Color4(60, 60, 60, 255),
Alpha = 0,
},
new Container
{
Width = default_width,
RelativeSizeAxes = Axes.Y,
Children = new[]
{
drawableIcon = new TextAwesome
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
},
}
},
headerText = new SpriteText
{
Position = new Vector2(default_width + 10, 0),
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
}
};
}
protected override bool OnClick(InputState state)
{
Action?.Invoke();
backgroundBox.FlashColour(Color4.White, 400);
return true;
}
protected override bool OnHover(InputState state)
{
backgroundBox.FadeTo(0.4f, 200);
return base.OnHover(state);
}
protected override void OnHoverLost(InputState state)
{
backgroundBox.FadeTo(0, 200);
base.OnHoverLost(state);
}
}
}
}

112
osu.Game/Overlays/Options/SidebarButton.cs Normal file
View File

@ -0,0 +1,112 @@
using System;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input;
using osu.Game.Graphics;
namespace osu.Game.Overlays.Options
{
public class SidebarButton : Container
{
private TextAwesome drawableIcon;
private SpriteText headerText;
private Box backgroundBox;
private Box selectionIndicator;
public Action Action;
private OptionsSection section;
public OptionsSection Section
{
get
{
return section;
}
set
{
section = value;
headerText.Text = value.Header;
drawableIcon.Icon = value.Icon;
}
}
private bool selected;
public bool Selected
{
get { return selected; }
set
{
selected = value;
if (selected)
selectionIndicator.FadeIn(50);
else
selectionIndicator.FadeOut(50);
}
}
public SidebarButton()
{
Height = OptionsSidebar.default_width;
RelativeSizeAxes = Axes.X;
Children = new Drawable[]
{
backgroundBox = new Box
{
RelativeSizeAxes = Axes.Both,
BlendingMode = BlendingMode.Additive,
Colour = new Color4(60, 60, 60, 255),
Alpha = 0,
},
new Container
{
Width = OptionsSidebar.default_width,
RelativeSizeAxes = Axes.Y,
Children = new[]
{
drawableIcon = new TextAwesome
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
},
}
},
headerText = new SpriteText
{
Position = new Vector2(OptionsSidebar.default_width + 10, 0),
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
},
selectionIndicator = new Box
{
Alpha = 0,
RelativeSizeAxes = Axes.Y,
Width = 5,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Colour = new Color4(233, 103, 161, 255)
}
};
}
protected override bool OnClick(InputState state)
{
Action?.Invoke();
backgroundBox.FlashColour(Color4.White, 400);
return true;
}
protected override bool OnHover(InputState state)
{
backgroundBox.FadeTo(0.4f, 200);
return base.OnHover(state);
}
protected override void OnHoverLost(InputState state)
{
backgroundBox.FadeTo(0, 200);
base.OnHoverLost(state);
}
}
}

42
osu.Game/Overlays/OptionsOverlay.cs
View File

@ -35,10 +35,13 @@ namespace osu.Game.Overlays
private ScrollContainer scrollContainer;
private OptionsSidebar sidebar;
private SidebarButton[] sidebarButtons;
private OptionsSection[] sections;
private float lastKnownScroll;
public OptionsOverlay()
{
var sections = new OptionsSection[]
sections = new OptionsSection[]
{
new GeneralSection(),
new GraphicsSection(),
@ -106,14 +109,15 @@ namespace osu.Game.Overlays
sidebar = new OptionsSidebar
{
Width = sidebar_width,
Children = sections.Select(section =>
new OptionsSidebar.SidebarButton
Children = sidebarButtons = sections.Select(section =>
new SidebarButton
{
Icon = section.Icon,
Header = section.Header,
Action = () => scrollContainer.ScrollIntoView(section),
Selected = sections[0] == section,
Section = section,
Action = () => scrollContainer.ScrollTo(
scrollContainer.GetChildYInContent(section) - scrollContainer.DrawSize.Y / 2),
}
)
).ToArray()
}
};
}
@ -124,6 +128,30 @@ namespace osu.Game.Overlays
scrollContainer.Padding = new MarginPadding { Top = game?.Toolbar.DrawHeight ?? 0 };
}
protected override void Update()
{
base.Update();
if (scrollContainer.Current != lastKnownScroll)
{
for (int i = sections.Length - 1; i >= 0; i--)
{
var section = sections[i];
float y = scrollContainer.GetChildYInContent(section) - scrollContainer.Current;
if (y <= scrollContainer.DrawSize.Y / 2 + 25)
{
var previous = sidebarButtons.SingleOrDefault(sb => sb.Selected);
var next = sidebarButtons.SingleOrDefault(sb => sb.Section == section);
if (next != null)
{
previous.Selected = false;
next.Selected = true;
}
break;
}
}
}
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)

1
osu.Game/osu.Game.csproj
View File

@ -239,6 +239,7 @@
<Compile Include="Overlays\Options\Online\PrivacyOptions.cs" />
<Compile Include="Overlays\Options\Online\NotificationsOptions.cs" />
<Compile Include="Overlays\Options\CheckBoxOption.cs" />
<Compile Include="Overlays\Options\SidebarButton.cs" />
<Compile Include="Overlays\Options\TextBoxOption.cs" />
</ItemGroup>
<ItemGroup>