h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 19:43:22 +08:00
Code Issues Releases Wiki Activity

Allow help text to wrap

Browse Source
This commit is contained in:
Dean Herbert 2018-05-14 15:41:31 +09:00
parent ede4d6dd11
commit addb864d10
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
View File

@ -12,6 +12,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Input; using osu.Game.Input;
using OpenTK.Graphics; using OpenTK.Graphics;
@ -43,7 +44,7 @@ namespace osu.Game.Overlays.KeyBinding
} }
private OsuSpriteText text; private OsuSpriteText text;
private OsuSpriteText pressAKey; private OsuTextFlowContainer pressAKey;
private FillFlowContainer<KeyButton> buttons; private FillFlowContainer<KeyButton> buttons;
@ -95,10 +96,11 @@ namespace osu.Game.Overlays.KeyBinding
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight Origin = Anchor.TopRight
}, },
pressAKey = new OsuSpriteText pressAKey = new OsuTextFlowContainer
{ {
Text = "Press a key to change binding, SHIFT+DEL to delete, ESC to cancel.", Text = "Press a key to change binding, Shift+Delete to delete, Escape to cancel.",
Y = height, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Margin = new MarginPadding(padding), Margin = new MarginPadding(padding),
Alpha = 0, Alpha = 0,
Colour = colours.YellowDark Colour = colours.YellowDark
@ -268,7 +270,7 @@ namespace osu.Game.Overlays.KeyBinding
GetContainingInputManager().ChangeFocus(null); GetContainingInputManager().ChangeFocus(null);
pressAKey.FadeOut(300, Easing.OutQuint); pressAKey.FadeOut(300, Easing.OutQuint);
pressAKey.Padding = new MarginPadding { Bottom = -pressAKey.DrawHeight }; pressAKey.Padding = new MarginPadding { Top = height, Bottom = -pressAKey.DrawHeight };
} }
protected override void OnFocus(InputState state) protected override void OnFocus(InputState state)
@ -277,7 +279,7 @@ namespace osu.Game.Overlays.KeyBinding
AutoSizeEasing = Easing.OutQuint; AutoSizeEasing = Easing.OutQuint;
pressAKey.FadeIn(300, Easing.OutQuint); pressAKey.FadeIn(300, Easing.OutQuint);
pressAKey.Padding = new MarginPadding(); pressAKey.Padding = new MarginPadding { Top = height };
updateBindTarget(); updateBindTarget();
base.OnFocus(state); base.OnFocus(state);

4
osu.Game/Overlays/KeyBindingOverlay.cs
View File

@ -12,8 +12,6 @@ namespace osu.Game.Overlays
{ {
public class KeyBindingOverlay : SettingsOverlay public class KeyBindingOverlay : SettingsOverlay
{ {
protected const float WIDTH = 430;
protected override Drawable CreateHeader() => new SettingsHeader("key configuration", "Customise your keys!"); protected override Drawable CreateHeader() => new SettingsHeader("key configuration", "Customise your keys!");
[BackgroundDependencyLoader(permitNulls: true)] [BackgroundDependencyLoader(permitNulls: true)]
@ -23,8 +21,6 @@ namespace osu.Game.Overlays
foreach (var ruleset in rulesets.AvailableRulesets) foreach (var ruleset in rulesets.AvailableRulesets)
AddSection(new RulesetBindingsSection(ruleset)); AddSection(new RulesetBindingsSection(ruleset));
ContentContainer.Width = WIDTH;
} }
public KeyBindingOverlay() public KeyBindingOverlay()