From 50b00e3827d831faaf02b679bc3e7bdfc703d4a2 Mon Sep 17 00:00:00 2001 From: KeatonTheBot Date: Mon, 17 Nov 2025 11:44:38 -0600 Subject: [PATCH] Null-conditional assignments, continued --- src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs | 5 +---- src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs | 5 +---- src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs | 6 ++---- src/Ryujinx/UI/Views/User/UserSelectorView.axaml.cs | 5 +---- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs index 96b6de99a..4d9300ac1 100644 --- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs +++ b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs @@ -37,10 +37,7 @@ namespace Ryujinx.Ava.UI.Controls private void SearchBox_OnKeyUp(object sender, KeyEventArgs args) { - if (DataContext is MainWindowViewModel model) - { - model.SearchText = (sender as TextBox)?.Text; - } + (DataContext as MainWindowViewModel)?.SearchText = (sender as TextBox)?.Text; } } } diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs index b0fd45e44..8cfc336a0 100644 --- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs +++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs @@ -38,10 +38,7 @@ namespace Ryujinx.Ava.UI.Controls private void SearchBox_OnKeyUp(object sender, KeyEventArgs args) { - if (DataContext is MainWindowViewModel model) - { - model.SearchText = (sender as TextBox)?.Text; - } + (DataContext as MainWindowViewModel)?.SearchText = (sender as TextBox)?.Text; } private async void IdString_OnClick(object sender, RoutedEventArgs e) diff --git a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs index 5631c7792..9b34d0469 100644 --- a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs +++ b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs @@ -69,10 +69,8 @@ namespace Ryujinx.Ava.UI.Views.Input if (_changeSlider != -1.0f && _changeSlider != (float)check.Value) { - if (DataContext is ControllerInputViewModel viewModel) - { - viewModel.ParentModel.IsModified = true; - } + var viewModel = (DataContext as ControllerInputViewModel); + viewModel?.ParentModel.IsModified = true; _changeSlider = (float)check.Value; } diff --git a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml.cs b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml.cs index 5b0ba5ca4..1b238d39b 100644 --- a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml.cs +++ b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml.cs @@ -42,10 +42,7 @@ namespace Ryujinx.Ava.UI.Views.User if (arg.NavigationMode == NavigationMode.Back) { - if (_parent.Parent != null) - { - ((ContentDialog)_parent.Parent).Title = LocaleManager.Instance[LocaleKeys.UserProfileWindowTitle]; - } + ((ContentDialog)_parent.Parent)?.Title = LocaleManager.Instance[LocaleKeys.UserProfileWindowTitle]; } DataContext = ViewModel;