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

Adjust calls to GetContainingInputManager()

Browse Source
This commit is contained in:
Bartłomiej Dach 2024-05-27 11:23:32 +02:00
parent 8a4ae5d23d
commit 659505f711
No known key found for this signature in database
34 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Catch/Edit/Blueprints/JuiceStreamPlacementBlueprint.cs
View File

@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Catch.Edit.Blueprints
{
base.LoadComplete();
inputManager = GetContainingInputManager();
inputManager = GetContainingInputManager()!;
BeginPlacement();
}

2
osu.Game.Rulesets.Catch/UI/CatcherArea.cs
View File

@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Catch.UI
{
base.Update();
var replayState = (GetContainingInputManager().CurrentState as RulesetInputManagerInputState<CatchAction>)?.LastReplayState as CatchFramedReplayInputHandler.CatchReplayState;
var replayState = (GetContainingInputManager()!.CurrentState as RulesetInputManagerInputState<CatchAction>)?.LastReplayState as CatchFramedReplayInputHandler.CatchReplayState;
SetCatcherPosition(
replayState?.CatcherX ??

2
osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
View File

@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Mania.Tests
AddStep("Hold key", () =>
{
clock.CurrentTime = 0;
note.OnPressed(new KeyBindingPressEvent<ManiaAction>(GetContainingInputManager().CurrentState, ManiaAction.Key1));
note.OnPressed(new KeyBindingPressEvent<ManiaAction>(GetContainingInputManager()!.CurrentState, ManiaAction.Key1));
});
AddStep("progress time", () => clock.CurrentTime = 500);
AddAssert("head is visible", () => note.Head.Alpha == 1);

4
osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
View File

@ -161,9 +161,9 @@ namespace osu.Game.Rulesets.Osu.Tests
pressed = value;
if (value)
OnPressed(new KeyBindingPressEvent<OsuAction>(GetContainingInputManager().CurrentState, OsuAction.LeftButton));
OnPressed(new KeyBindingPressEvent<OsuAction>(GetContainingInputManager()!.CurrentState, OsuAction.LeftButton));
else
OnReleased(new KeyBindingReleaseEvent<OsuAction>(GetContainingInputManager().CurrentState, OsuAction.LeftButton));
OnReleased(new KeyBindingReleaseEvent<OsuAction>(GetContainingInputManager()!.CurrentState, OsuAction.LeftButton));
}
}

2
osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
View File

@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Osu.Tests
private void scheduleHit() => AddStep("schedule action", () =>
{
double delay = hitCircle.StartTime - hitCircle.HitWindows.WindowFor(HitResult.Great) - Time.Current;
Scheduler.AddDelayed(() => hitAreaReceptor.OnPressed(new KeyBindingPressEvent<OsuAction>(GetContainingInputManager().CurrentState, OsuAction.LeftButton)), delay);
Scheduler.AddDelayed(() => hitAreaReceptor.OnPressed(new KeyBindingPressEvent<OsuAction>(GetContainingInputManager()!.CurrentState, OsuAction.LeftButton)), delay);
});
}
}

2
osu.Game.Tests/Visual/Editing/TestScenePositionSnapGrid.cs
View File

@ -92,7 +92,7 @@ namespace osu.Game.Tests.Visual.Editing
{
base.LoadComplete();
updatePosition(GetContainingInputManager().CurrentState.Mouse.Position);
updatePosition(GetContainingInputManager()!.CurrentState.Mouse.Position);
}
protected override bool OnMouseMove(MouseMoveEvent e)

2
osu.Game/Graphics/Cursor/GlobalCursorDisplay.cs
View File

@ -53,7 +53,7 @@ namespace osu.Game.Graphics.Cursor
{
base.LoadComplete();
inputManager = GetContainingInputManager();
inputManager = GetContainingInputManager()!;
showDuringTouch = config.GetBindable<bool>(OsuSetting.GameplayCursorDuringTouch);
}

2
osu.Game/Graphics/UserInterface/FocusedTextBox.cs
View File

@ -31,7 +31,7 @@ namespace osu.Game.Graphics.UserInterface
if (!allowImmediateFocus)
return;
Scheduler.Add(() => GetContainingFocusManager()?.ChangeFocus(this));
Scheduler.Add(() => GetContainingFocusManager()!.ChangeFocus(this));
}
public new void KillFocus() => base.KillFocus();

2
osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
protected override void OnFocus(FocusEvent e)
{
base.OnFocus(e);
GetContainingFocusManager()?.ChangeFocus(Component);
GetContainingFocusManager()!.ChangeFocus(Component);
}
protected override OsuTextBox CreateComponent() => CreateTextBox().With(t =>

2
osu.Game/Overlays/AccountCreation/ScreenEntry.cs
View File

@ -243,7 +243,7 @@ namespace osu.Game.Overlays.AccountCreation
if (nextTextBox != null)
{
Schedule(() => GetContainingFocusManager()?.ChangeFocus(nextTextBox));
Schedule(() => GetContainingFocusManager()!.ChangeFocus(nextTextBox));
return true;
}

2
osu.Game/Overlays/Comments/ReplyCommentEditor.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Comments
base.LoadComplete();
if (!TextBox.ReadOnly)
GetContainingFocusManager()?.ChangeFocus(TextBox);
GetContainingFocusManager()!.ChangeFocus(TextBox);
}
protected override void OnCommit(string text)

2
osu.Game/Overlays/Login/LoginForm.cs
View File

@ -150,7 +150,7 @@ namespace osu.Game.Overlays.Login
protected override void OnFocus(FocusEvent e)
{
Schedule(() => { GetContainingFocusManager()?.ChangeFocus(string.IsNullOrEmpty(username.Text) ? username : password); });
Schedule(() => { GetContainingFocusManager()!.ChangeFocus(string.IsNullOrEmpty(username.Text) ? username : password); });
}
}
}

2
osu.Game/Overlays/Login/LoginPanel.cs
View File

@ -216,7 +216,7 @@ namespace osu.Game.Overlays.Login
protected override void OnFocus(FocusEvent e)
{
if (form != null) GetContainingFocusManager()?.ChangeFocus(form);
if (form != null) GetContainingFocusManager()!.ChangeFocus(form);
base.OnFocus(e);
}
}

2
osu.Game/Overlays/Login/SecondFactorAuthForm.cs
View File

@ -141,7 +141,7 @@ namespace osu.Game.Overlays.Login
protected override void OnFocus(FocusEvent e)
{
Schedule(() => { GetContainingFocusManager()?.ChangeFocus(codeTextBox); });
Schedule(() => { GetContainingFocusManager()!.ChangeFocus(codeTextBox); });
}
}
}

2
osu.Game/Overlays/LoginOverlay.cs
View File

@ -78,7 +78,7 @@ namespace osu.Game.Overlays
this.FadeIn(transition_time, Easing.OutQuint);
FadeEdgeEffectTo(WaveContainer.SHADOW_OPACITY, WaveContainer.APPEAR_DURATION, Easing.Out);
ScheduleAfterChildren(() => GetContainingFocusManager()?.ChangeFocus(panel));
ScheduleAfterChildren(() => GetContainingFocusManager()!.ChangeFocus(panel));
}
protected override void PopOut()

2
osu.Game/Overlays/Mods/AddPresetPopover.cs
View File

@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Mods
{
base.LoadComplete();
ScheduleAfterChildren(() => GetContainingFocusManager()?.ChangeFocus(nameTextBox));
ScheduleAfterChildren(() => GetContainingFocusManager()!.ChangeFocus(nameTextBox));
nameTextBox.Current.BindValueChanged(s =>
{

2
osu.Game/Overlays/Mods/EditPresetPopover.cs
View File

@ -136,7 +136,7 @@ namespace osu.Game.Overlays.Mods
{
base.LoadComplete();
ScheduleAfterChildren(() => GetContainingFocusManager()?.ChangeFocus(nameTextBox));
ScheduleAfterChildren(() => GetContainingFocusManager()!.ChangeFocus(nameTextBox));
}
public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)

2
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -949,7 +949,7 @@ namespace osu.Game.Overlays.Mods
RequestScroll?.Invoke(this);
// Killing focus is done here because it's the only feasible place on ModSelectOverlay you can click on without triggering any action.
Scheduler.Add(() => GetContainingFocusManager()?.ChangeFocus(null));
Scheduler.Add(() => GetContainingFocusManager()!.ChangeFocus(null));
return true;
}

2
osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
View File

@ -465,7 +465,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
}
if (HasFocus)
GetContainingFocusManager()?.ChangeFocus(null);
GetContainingFocusManager()!.ChangeFocus(null);
cancelAndClearButtons.FadeOut(300, Easing.OutQuint);
cancelAndClearButtons.BypassAutoSizeAxes |= Axes.Y;

2
osu.Game/Overlays/SettingsPanel.cs
View File

@ -201,7 +201,7 @@ namespace osu.Game.Overlays
searchTextBox.HoldFocus = false;
if (searchTextBox.HasFocus)
GetContainingFocusManager()?.ChangeFocus(null);
GetContainingFocusManager()!.ChangeFocus(null);
}
public override bool AcceptsFocus => true;

2
osu.Game/Overlays/SkinEditor/SkinEditor.cs
View File

@ -669,7 +669,7 @@ namespace osu.Game.Overlays.SkinEditor
{
SpriteName = { Value = file.Name },
Origin = Anchor.Centre,
Position = skinnableTarget.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position),
Position = skinnableTarget.ToLocalSpace(GetContainingInputManager()!.CurrentState.Mouse.Position),
};
SelectedComponents.Clear();

2
osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
View File

@ -580,7 +580,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
{
base.LoadComplete();
GetContainingFocusManager()?.ChangeFocus(this);
GetContainingFocusManager()!.ChangeFocus(this);
SelectAll();
}
}

2
osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
View File

@ -138,7 +138,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
protected override void LoadComplete()
{
base.LoadComplete();
ScheduleAfterChildren(() => GetContainingFocusManager()?.ChangeFocus(sliderVelocitySlider));
ScheduleAfterChildren(() => GetContainingFocusManager()!.ChangeFocus(sliderVelocitySlider));
}
}
}

2
osu.Game/Screens/Edit/Setup/LabelledTextBoxWithPopover.cs
View File

@ -45,7 +45,7 @@ namespace osu.Game.Screens.Edit.Setup
OnFocused?.Invoke();
base.OnFocus(e);
GetContainingFocusManager()?.TriggerFocusContention(this);
GetContainingFocusManager()!.TriggerFocusContention(this);
}
}
}

2
osu.Game/Screens/Edit/Setup/MetadataSection.cs
View File

@ -70,7 +70,7 @@ namespace osu.Game.Screens.Edit.Setup
base.LoadComplete();
if (string.IsNullOrEmpty(ArtistTextBox.Current.Value))
ScheduleAfterChildren(() => GetContainingFocusManager()?.ChangeFocus(ArtistTextBox));
ScheduleAfterChildren(() => GetContainingFocusManager()!.ChangeFocus(ArtistTextBox));
ArtistTextBox.Current.BindValueChanged(artist => transferIfRomanised(artist.NewValue, RomanisedArtistTextBox));
TitleTextBox.Current.BindValueChanged(title => transferIfRomanised(title.NewValue, RomanisedTitleTextBox));

2
osu.Game/Screens/Edit/Timing/IndeterminateSliderWithTextBoxInput.cs
View File

@ -126,7 +126,7 @@ namespace osu.Game.Screens.Edit.Timing
protected override void OnFocus(FocusEvent e)
{
base.OnFocus(e);
GetContainingFocusManager()?.ChangeFocus(textBox);
GetContainingFocusManager()!.ChangeFocus(textBox);
}
private void updateState()

2
osu.Game/Screens/Edit/Verify/IssueTable.cs
View File

@ -53,7 +53,7 @@ namespace osu.Game.Screens.Edit.Verify
if (issue.Time != null)
{
clock.Seek(issue.Time.Value);
editor.OnPressed(new KeyBindingPressEvent<GlobalAction>(GetContainingInputManager().CurrentState, GlobalAction.EditorComposeMode));
editor.OnPressed(new KeyBindingPressEvent<GlobalAction>(GetContainingInputManager()!.CurrentState, GlobalAction.EditorComposeMode));
}
if (!issue.HitObjects.Any())

4
osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
View File

@ -248,7 +248,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
{
base.LoadComplete();
ScheduleAfterChildren(() => GetContainingFocusManager()?.ChangeFocus(passwordTextBox));
ScheduleAfterChildren(() => GetContainingFocusManager()!.ChangeFocus(passwordTextBox));
passwordTextBox.OnCommit += (_, _) => performJoin();
}
@ -262,7 +262,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
{
passwordTextBox.Text = string.Empty;
GetContainingFocusManager()?.ChangeFocus(passwordTextBox);
GetContainingFocusManager()!.ChangeFocus(passwordTextBox);
errorText.Text = error;
errorText

2
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -249,7 +249,7 @@ namespace osu.Game.Screens.Play
{
base.LoadComplete();
inputManager = GetContainingInputManager();
inputManager = GetContainingInputManager()!;
showStoryboards.BindValueChanged(val => epilepsyWarning?.FadeTo(val.NewValue ? 1 : 0, 250, Easing.OutQuint), true);
epilepsyWarning?.FinishTransforms(true);

2
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -1279,7 +1279,7 @@ namespace osu.Game.Screens.Select
{
// we need to block right click absolute scrolling when hovering a carousel item so context menus can display.
// this can be reconsidered when we have an alternative to right click scrolling.
if (GetContainingInputManager().HoveredDrawables.OfType<DrawableCarouselItem>().Any())
if (GetContainingInputManager()!.HoveredDrawables.OfType<DrawableCarouselItem>().Any())
{
rightMouseScrollBlocked = true;
return false;

2
osu.Game/Screens/Select/FilterControl.cs
View File

@ -245,7 +245,7 @@ namespace osu.Game.Screens.Select
searchTextBox.ReadOnly = true;
searchTextBox.HoldFocus = false;
if (searchTextBox.HasFocus)
GetContainingFocusManager()?.ChangeFocus(searchTextBox);
GetContainingFocusManager()!.ChangeFocus(searchTextBox);
}
public void Activate()

2
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -95,7 +95,7 @@ namespace osu.Game.Screens.Select
modsAtGameplayStart = Mods.Value;
// Ctrl+Enter should start map with autoplay enabled.
if (GetContainingInputManager().CurrentState?.Keyboard.ControlPressed == true)
if (GetContainingInputManager()?.CurrentState?.Keyboard.ControlPressed == true)
{
var autoInstance = getAutoplayMod();

2
osu.Game/Screens/SelectV2/Footer/BeatmapOptionsPopover.cs
View File

@ -81,7 +81,7 @@ namespace osu.Game.Screens.SelectV2.Footer
{
base.LoadComplete();
ScheduleAfterChildren(() => GetContainingFocusManager()?.ChangeFocus(this));
ScheduleAfterChildren(() => GetContainingFocusManager()!.ChangeFocus(this));
beatmap.BindValueChanged(_ => Hide());
}

2
osu.Game/Screens/Utility/SampleComponents/LatencySampleComponent.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Screens.Utility.SampleComponents
{
base.LoadComplete();
inputManager = GetContainingInputManager();
inputManager = GetContainingInputManager()!;
IsActive.BindTo(latencyArea.IsActiveArea);
}