RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-25 16:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix options sidebar being transparent when moving in from the side, showing a view of the broken region left of the gamemode stack."

Browse Source 
This reverts commit 27a13eec97.
This commit is contained in:
Thomas Müller 2016-11-30 20:50:41 +01:00
parent 380303902d
commit 579b8328dc
1 changed files with 34 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,6 @@ namespace osu.Game.Overlays
private const float sidebar_padding = 10; private const float sidebar_padding = 10;
private Container scrollableSection;
private ScrollContainer scrollContainer; private ScrollContainer scrollContainer;
private OptionsSidebar sidebar; private OptionsSidebar sidebar;
private SidebarButton[] sidebarButtons; private SidebarButton[] sidebarButtons;
@ -65,59 +64,50 @@ namespace osu.Game.Overlays
Children = new Drawable[] Children = new Drawable[]
{ {
scrollableSection = new Container() new Box
{ {
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
Alpha = 0.6f,
},
scrollContainer = new ScrollContainer
{
ScrollDraggerVisible = false,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X, Width = width,
Margin = new MarginPadding { Left = SIDEBAR_WIDTH },
Children = new Drawable[] Children = new[]
{ {
new Box new FlowContainer
{ {
RelativeSizeAxes = Axes.Both, AutoSizeAxes = Axes.Y,
Colour = Color4.Black, RelativeSizeAxes = Axes.X,
Alpha = 0.6f, Direction = FlowDirection.VerticalOnly,
},
scrollContainer = new ScrollContainer Children = new Drawable[]
{
ScrollDraggerVisible = false,
RelativeSizeAxes = Axes.Y,
Width = width,
Margin = new MarginPadding { Left = SIDEBAR_WIDTH },
Children = new[]
{ {
new SpriteText
{
Text = "settings",
TextSize = 40,
Margin = new MarginPadding { Left = CONTENT_MARGINS, Top = 30 },
},
new SpriteText
{
Colour = new Color4(255, 102, 170, 255),
Text = "Change the way osu! behaves",
TextSize = 18,
Margin = new MarginPadding { Left = CONTENT_MARGINS, Bottom = 30 },
},
new FlowContainer new FlowContainer
{ {
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Direction = FlowDirection.VerticalOnly, Direction = FlowDirection.VerticalOnly,
Children = sections,
Children = new Drawable[]
{
new SpriteText
{
Text = "settings",
TextSize = 40,
Margin = new MarginPadding { Left = CONTENT_MARGINS, Top = 30 },
},
new SpriteText
{
Colour = new Color4(255, 102, 170, 255),
Text = "Change the way osu! behaves",
TextSize = 18,
Margin = new MarginPadding { Left = CONTENT_MARGINS, Bottom = 30 },
},
new FlowContainer
{
AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X,
Direction = FlowDirection.VerticalOnly,
Children = sections,
}
}
} }
} }
}, }
} }
}, },
sidebar = new OptionsSidebar sidebar = new OptionsSidebar
@ -191,16 +181,14 @@ namespace osu.Game.Overlays
{ {
scrollContainer.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint); scrollContainer.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint);
sidebar.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint); sidebar.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint);
FadeTo(1, TRANSITION_LENGTH / 2);
scrollableSection.FadeTo(1, TRANSITION_LENGTH / 2);
} }
protected override void PopOut() protected override void PopOut()
{ {
scrollContainer.MoveToX(-width, TRANSITION_LENGTH, EasingTypes.OutQuint); scrollContainer.MoveToX(-width, TRANSITION_LENGTH, EasingTypes.OutQuint);
sidebar.MoveToX(-SIDEBAR_WIDTH, TRANSITION_LENGTH, EasingTypes.OutQuint); sidebar.MoveToX(-SIDEBAR_WIDTH, TRANSITION_LENGTH, EasingTypes.OutQuint);
FadeTo(0, TRANSITION_LENGTH / 2);
scrollableSection.FadeTo(0, TRANSITION_LENGTH / 2);
} }
} }
} }