h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-12 15:33:22 +08:00
Code Issues Releases Wiki Activity

Reformat code

Browse Source
This commit is contained in:
Bartłomiej Dach 2023-10-12 19:04:47 +02:00
parent 991e425b9a
commit 08bdea0036
No known key found for this signature in database
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Overlays/Settings/Sections/Input/KeyBindingConflictPopover.cs
View File

@ -55,8 +55,14 @@ namespace osu.Game.Overlays.Settings.Sections.Input
Text = "The binding you've selected conflicts with another existing binding.",
Margin = new MarginPadding { Bottom = 10 }
},
existingPreview = new ConflictingKeyBindingPreview(ConflictInfo.Value.Existing.Action, ConflictInfo.Value.Existing.CombinationWhenChosen, ConflictInfo.Value.Existing.CombinationWhenNotChosen),
newPreview = new ConflictingKeyBindingPreview(ConflictInfo.Value.New.Action, ConflictInfo.Value.New.CombinationWhenChosen, ConflictInfo.Value.New.CombinationWhenNotChosen),
existingPreview = new ConflictingKeyBindingPreview(
ConflictInfo.Value.Existing.Action,
ConflictInfo.Value.Existing.CombinationWhenChosen,
ConflictInfo.Value.Existing.CombinationWhenNotChosen),
newPreview = new ConflictingKeyBindingPreview(
ConflictInfo.Value.New.Action,
ConflictInfo.Value.New.CombinationWhenChosen,
ConflictInfo.Value.New.CombinationWhenNotChosen),
new Container
{
RelativeSizeAxes = Axes.X,