sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-31 18:37:32 +09: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 27a13eec97a292d828aa2e8e440d0bef2d4d7194.
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

16
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;
@ -63,13 +62,6 @@ namespace osu.Game.Overlays
RelativeSizeAxes = Axes.Y; RelativeSizeAxes = Axes.Y;
AutoSizeAxes = Axes.X; AutoSizeAxes = Axes.X;
Children = new Drawable[]
{
scrollableSection = new Container()
{
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Children = new Drawable[] Children = new Drawable[]
{ {
new Box new Box
@ -118,8 +110,6 @@ namespace osu.Game.Overlays
} }
} }
}, },
}
},
sidebar = new OptionsSidebar sidebar = new OptionsSidebar
{ {
Width = SIDEBAR_WIDTH, Width = SIDEBAR_WIDTH,
@ -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);
} }
} }
} }