h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 17:07:38 +08:00
Code Issues 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 Container scrollableSection;
private ScrollContainer scrollContainer;
private OptionsSidebar sidebar;
private SidebarButton[] sidebarButtons;
@ -65,59 +64,50 @@ namespace osu.Game.Overlays
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,
AutoSizeAxes = Axes.X,
Children = new Drawable[]
Width = width,
Margin = new MarginPadding { Left = SIDEBAR_WIDTH },
Children = new[]
{
new Box
new FlowContainer
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
Alpha = 0.6f,
},
scrollContainer = new ScrollContainer
{
ScrollDraggerVisible = false,
RelativeSizeAxes = Axes.Y,
Width = width,
Margin = new MarginPadding { Left = SIDEBAR_WIDTH },
Children = new[]
AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X,
Direction = FlowDirection.VerticalOnly,
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 = 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,
}
}
Children = sections,
}
}
},
}
}
},
sidebar = new OptionsSidebar
@ -191,16 +181,14 @@ namespace osu.Game.Overlays
{
scrollContainer.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint);
sidebar.MoveToX(0, TRANSITION_LENGTH, EasingTypes.OutQuint);
scrollableSection.FadeTo(1, TRANSITION_LENGTH / 2);
FadeTo(1, TRANSITION_LENGTH / 2);
}
protected override void PopOut()
{
scrollContainer.MoveToX(-width, TRANSITION_LENGTH, EasingTypes.OutQuint);
sidebar.MoveToX(-SIDEBAR_WIDTH, TRANSITION_LENGTH, EasingTypes.OutQuint);
scrollableSection.FadeTo(0, TRANSITION_LENGTH / 2);
FadeTo(0, TRANSITION_LENGTH / 2);
}
}
}