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

Make toolbar buttons more independent logic-wise.

Browse Source 
Also adds visual toggle state for toggleable buttons.
This commit is contained in:
Dean Herbert
2016-12-02 18:43:01 +09:00
parent bc2391578c
commit 9bf36418a0
8 changed files with 156 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game/Overlays/Toolbar/Toolbar.cs
View File

@ -2,7 +2,6 @@
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
@ -22,10 +21,8 @@ namespace osu.Game.Overlays.Toolbar
{
private const float height = 50;
public Action OnSettings;
public Action OnHome;
public Action<PlayMode> OnPlayModeChange;
public Action OnMusicController;
private ToolbarModeSelector modeSelector;
private Box solidBackground;
@ -87,18 +84,9 @@ namespace osu.Game.Overlays.Toolbar
AutoSizeAxes = Axes.X,
Children = new Drawable[]
{
new ToolbarButton
new ToolbarSettingsButton(),
new ToolbarHomeButton()
{
Icon = FontAwesome.fa_gear,
TooltipMain = "Settings",
TooltipSub = "Change your settings",
Action = () => OnSettings?.Invoke()
},
new ToolbarButton
{
Icon = FontAwesome.fa_home,
TooltipMain = "Home",
TooltipSub = "Return to the main menu",
Action = () => OnHome?.Invoke()
},
modeSelector = new ToolbarModeSelector
@ -116,11 +104,7 @@ namespace osu.Game.Overlays.Toolbar
AutoSizeAxes = Axes.X,
Children = new []
{
new ToolbarButton
{
Icon = FontAwesome.fa_music,
Action = () => OnMusicController?.Invoke()
},
new ToolbarMusicButton(),
new ToolbarButton
{
Icon = FontAwesome.fa_search

2
osu.Game/Overlays/Toolbar/ToolbarButton.cs
View File

@ -133,7 +133,7 @@ namespace osu.Game.Overlays.Toolbar
protected override bool OnClick(InputState state)
{
Action?.Invoke();
HoverBackground.FlashColour(new Color4(255, 255, 255, 180), 800, EasingTypes.OutQuint);
HoverBackground.FlashColour(new Color4(255, 255, 255, 100), 500, EasingTypes.OutQuint);
return true;
}

19
osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs Normal file
View File

@ -0,0 +1,19 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Game.Graphics;
using osu.Game.Screens.Menu;
namespace osu.Game.Overlays.Toolbar
{
class ToolbarHomeButton : ToolbarButton
{
public ToolbarHomeButton()
{
Icon = FontAwesome.fa_home;
TooltipMain = "Home";
TooltipSub = "Return to the main menu";
}
}
}

23
osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs Normal file
View File

@ -0,0 +1,23 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Game.Graphics;
namespace osu.Game.Overlays.Toolbar
{
class ToolbarMusicButton : ToolbarToggleButton
{
public ToolbarMusicButton()
{
Icon = FontAwesome.fa_music;
}
[BackgroundDependencyLoader]
private void load(MusicController music)
{
StateContainer = music;
Action = music.ToggleVisibility;
}
}
}

25
osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs Normal file
View File

@ -0,0 +1,25 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Game.Graphics;
namespace osu.Game.Overlays.Toolbar
{
class ToolbarSettingsButton : ToolbarToggleButton
{
public ToolbarSettingsButton()
{
Icon = FontAwesome.fa_gear;
TooltipMain = "Settings";
TooltipSub = "Change your settings";
}
[BackgroundDependencyLoader]
private void load(OptionsOverlay options)
{
StateContainer = options;
Action = options.ToggleVisibility;
}
}
}

71
osu.Game/Overlays/Toolbar/ToolbarToggleButton.cs Normal file
View File

@ -0,0 +1,71 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Game.Configuration;
using osu.Game.Online.API;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Overlays.Toolbar
{
class ToolbarToggleButton : ToolbarButton
{
private Box StateBackground;
private OverlayContainer stateContainer;
public OverlayContainer StateContainer
{
get { return stateContainer; }
set
{
stateContainer = value;
stateContainer.StateChanged += stateChanged;
}
}
public ToolbarToggleButton()
{
Add(StateBackground = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = new Color4(150, 150, 150, 180),
BlendingMode = BlendingMode.Additive,
Depth = 2,
Alpha = 0,
});
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
if (stateContainer != null)
stateContainer.StateChanged -= stateChanged;
}
private void stateChanged(OverlayContainer c, Visibility state)
{
switch (state)
{
case Visibility.Hidden:
StateBackground.FadeOut(200);
break;
case Visibility.Visible:
StateBackground.FadeIn(200);
break;
}
}
}
}