h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 09:47:52 +08:00
Code Issues Releases Wiki Activity

Keep shortcut padding even when there is no shortut

Browse Source
This commit is contained in:
smoogipoo 2018-05-10 18:49:19 +09:00
parent c03ab9014f
commit df604c40cc
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 0773d895d9aa0729995cd4a23efc28238e35ceed Subproject commit 5c135a7360388dc41b1dc4387769a98ee1635d36

16
osu.Game/Overlays/OnScreenDisplay.cs
View File

@ -31,6 +31,7 @@ namespace osu.Game.Overlays
private readonly SpriteText textLine3; private readonly SpriteText textLine3;
private const float height = 110; private const float height = 110;
private const float height_notext = 98;
private const float height_contracted = height * 0.9f; private const float height_contracted = height * 0.9f;
private readonly FillFlowContainer<OptionLight> optionLights; private readonly FillFlowContainer<OptionLight> optionLights;
@ -100,15 +101,20 @@ namespace osu.Game.Overlays
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
AutoSizeAxes = Axes.Both AutoSizeAxes = Axes.Both
}, },
textLine3 = new OsuSpriteText new Container
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Padding = new MarginPadding { Bottom = 15 }, AutoSizeAxes = Axes.Both,
Font = @"Exo2.0-Bold", Margin = new MarginPadding { Bottom = 15 },
TextSize = 12,
Alpha = 0.3f, Alpha = 0.3f,
}, Child = textLine3 = new OsuSpriteText
{
Font = @"Exo2.0-Bold",
TextSize = 12,
AlwaysPresent = true
},
}
} }
} }
} }