RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix transition stutter

This commit is contained in:
DrabWeb 2017-02-22 16:37:58 -04:00
parent cf5258ceb0
commit a58a0a4edf
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/Overlays/Mods/ModSection.cs
View File

@ -1,23 +1,28 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Copyright (c) 2007-2017 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;
using System.Collections.Generic;
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Primitives;
using osu.Game.Graphics.Sprites;
using osu.Game.Modes;
namespace osu.Game.Overlays.Mods
{
class AlwaysPresentFlowContainer : FlowContainer
{
public override bool IsPresent => true;
}
public class ModSection : Container
{
private OsuSpriteText headerLabel;
private FlowContainer buttonsContainer;
private AlwaysPresentFlowContainer buttonsContainer;
public FlowContainer ButtonsContainer
{
get
@ -95,9 +100,9 @@ public ModButton[] Buttons
if (value == colour) return;
colour = value;
foreach (ModButton button in buttons)
{
button.Colour = value;
foreach (ModButton button in buttons)
{
button.Colour = value;
}
}
}
@ -148,7 +153,7 @@ public ModSection()
Font = @"Exo2.0-Bold",
Text = Header,
},
buttonsContainer = new FlowContainer
buttonsContainer = new AlwaysPresentFlowContainer
{
AutoSizeAxes = Axes.Both,
Origin = Anchor.BottomLeft,

3
osu.Game/Overlays/WaveOverlayContainer.cs
View File

@ -121,9 +121,6 @@ public Color4 FourthWaveColour
}
}
// TODO: Remove when framework updated
public override bool HandleInput => State == Visibility.Visible;
protected override void PopIn()
{
base.Show();