[Editor] Use new null conditional syntax in xaml binding

Kryptos-FR · Kryptos-FR · commit 46ab1872681c · 2025-06-12T10:00:44.000+02:00
This reduces the number of binding errors.
diff --git a/sources/editor/Stride.Core.Assets.Editor.Avalonia/Views/DefaultPropertyTemplateProviders.axaml b/sources/editor/Stride.Core.Assets.Editor.Avalonia/Views/DefaultPropertyTemplateProviders.axaml
@@ -239,8 +239,8 @@
           </TextBox>
           <CheckBox Grid.Column="3"
                     Margin="2,0" HorizontalAlignment="Left" VerticalAlignment="Center"
-                    IsChecked="{ReflectionBinding [Enabled].NodeValue, Converter={caec:DifferentValuesToParam}, ConverterParameter={x:Null}, FallbackValue={x:False}, TargetNullValue={x:False}}"
-                    IsThreeState="{ReflectionBinding [Enabled].NodeValue, Converter={sd:IsEqualToParam}, ConverterParameter={x:Static cpqvm:NodeViewModel.DifferentValues}, FallbackValue={x:False}, TargetNullValue={x:False}}"
+                    IsChecked="{ReflectionBinding [Enabled]?.NodeValue, Converter={caec:DifferentValuesToParam}, ConverterParameter={x:Null}, TargetNullValue={x:False}}"
+                    IsThreeState="{ReflectionBinding [Enabled]?.NodeValue, Converter={sd:IsEqualToParam}, ConverterParameter={x:Static cpqvm:NodeViewModel.DifferentValues}, TargetNullValue={x:False}}"
                     IsVisible="{Binding [HasChild_Enabled], FallbackValue={x:False}}"/>
           <Interaction.Behaviors>
             <DataTriggerBehavior Binding="{sd:MultiBinding {Binding ConverterParameter=[IsOverridden], Converter={caec:NodePathToObject}},
@@ -309,8 +309,8 @@
         <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
           <CheckBox Margin="4,0" VerticalAlignment="Center"
                     IsVisible="{Binding [HasChild_Enabled]}"
-                    IsChecked="{ReflectionBinding [Enabled].NodeValue, Converter={caec:DifferentValuesToParam}, ConverterParameter={x:Null}, FallbackValue={x:False}, TargetNullValue={x:False}}"
-                    IsThreeState="{ReflectionBinding [Enabled].NodeValue, Converter={sd:IsEqualToParam}, ConverterParameter={x:Static cpqvm:NodeViewModel.DifferentValues}, FallbackValue={x:False}, TargetNullValue={x:False}}"/>
+                    IsChecked="{ReflectionBinding [Enabled]?.NodeValue, Converter={caec:DifferentValuesToParam}, ConverterParameter={x:Null}, TargetNullValue={x:False}}"
+                    IsThreeState="{ReflectionBinding [Enabled]?.NodeValue, Converter={sd:IsEqualToParam}, ConverterParameter={x:Static cpqvm:NodeViewModel.DifferentValues}, TargetNullValue={x:False}}"/>
           <Image Source="{Binding NodeValue, Converter={sd:Chained {sd:ObjectToType}, {caec:TypeToResource}}}"
                  MaxWidth="16" MaxHeight="16" Margin="0,0,4,0"/>
           <TextBlock x:Name="HeaderTextBlock" FontSize="16" TextTrimming="CharacterEllipsis"
@@ -1435,7 +1435,7 @@
               <Image x:Name="ThumbnailImage"
                      Width="64" Height="64"
                      DataContext="{Binding ((capvm:AssetViewModel)NodeValue), Converter={caec:ContentReferenceToAsset}}"
-                     Source="{Binding ThumbnailData.Presenter, Mode=OneWay}"/>
+                     Source="{Binding ThumbnailData?.Presenter, Mode=OneWay}"/>
               <Interaction.Behaviors>
                 <!-- FIXME only on pointer down -->
                 <EventTriggerBehavior EventName="PointerPressed" >
diff --git a/sources/editor/Stride.GameStudio.Avalonia/Controls/DebugAssetNodesUserControl.axaml b/sources/editor/Stride.GameStudio.Avalonia/Controls/DebugAssetNodesUserControl.axaml
@@ -32,7 +32,7 @@
           <DockPanel>
             <Button DockPanel.Dock="Right" Command="{Binding BreakCommand}" Theme="{StaticResource BreakButonTheme}"/>
             <TextBlock x:Name="TextBlock">
-              [<Run Text="{Binding AssetType.Name, Mode=OneWay}"/>]
+              [<Run Text="{Binding AssetType?.Name, Mode=OneWay}"/>]
               <Run Text="{Binding AssetName, Mode=OneWay}" FontWeight="Bold" Foreground="Gold"/>
             </TextBlock>
           </DockPanel>
@@ -46,7 +46,7 @@
               <Run Text="Base:" FontWeight="Bold" Foreground="Orchid"/>
               <Run Text="{Binding Name, Mode=OneWay}" FontWeight="Bold" Foreground="Gold"/>
               = <Run Text="{Binding Value, Mode=OneWay}" FontWeight="Bold" Foreground="PowderBlue"/>
-              from <Run Text="{Binding Asset.Url, Mode=OneWay}"/>
+              from <Run Text="{Binding Asset?.Url, Mode=OneWay}"/>
             </TextBlock>
           </DockPanel>
         </DataTemplate>
@@ -60,7 +60,7 @@
               <Run Text="{Binding ItemId, StringFormat=[{0}], Mode=OneWay}" x:Name="ItemIdRun" Foreground="LightCyan"/>
               <Run Text="{Binding Name, Mode=OneWay}" FontWeight="Bold" Foreground="Gold"/>
               = <Run Text="{Binding Value, Mode=OneWay}" FontWeight="Bold" Foreground="PowderBlue"/>
-              <Run Text="{Binding Type.Name, StringFormat=({0}), Mode=OneWay}"/>
+              <Run Text="{Binding Type?.Name, StringFormat=({0}), Mode=OneWay}"/>
             </TextBlock>
             <Button DockPanel.Dock="Right" Command="{Binding BreakCommand}" Theme="{StaticResource BreakButonTheme}"/>
             <ContentControl Content="{Binding Base}"/>
diff --git a/sources/editor/Stride.GameStudio.Avalonia/Views/AssetExplorerView.axaml b/sources/editor/Stride.GameStudio.Avalonia/Views/AssetExplorerView.axaml
@@ -31,7 +31,7 @@
             </Interaction.Behaviors>
             <TextBlock Text="Asset: " />
             <TextBlock Text="{Binding Name}" />
-            <Image Source="{Binding ThumbnailData.Presenter, Converter={gscv:StrideImage}, FallbackValue={x:Static AvaloniaProperty.UnsetValue}}"
+            <Image Source="{Binding ThumbnailData?.Presenter, Converter={gscv:StrideImage}}"
                    Width="64" Height="64"/>
           </StackPanel>
         </DataTemplate>
diff --git a/sources/editor/Stride.GameStudio.Avalonia/Views/MainView.axaml b/sources/editor/Stride.GameStudio.Avalonia/Views/MainView.axaml
@@ -47,10 +47,10 @@
       <!-- Edit menu -->
       <MenuItem Header="{sd:LocalizeString Edit, Context=Menu}">
         <MenuItem Header="{sd:LocalizeString Undo, Context=Menu}"
-                  Command="{Binding Session.ActionHistory.UndoCommand, FallbackValue={x:Static cpc:DisabledCommand.Instance}}"
+                  Command="{Binding Session?.ActionHistory?.UndoCommand, TargetNullValue={x:Static cpc:DisabledCommand.Instance}}"
                   HotKey="{x:Static gsvw:MainView.UndoGesture}" InputGesture="{Binding $self.HotKey, Mode=OneTime}"/>
         <MenuItem Header="{sd:LocalizeString Redo, Context=Menu}"
-                  Command="{Binding Session.ActionHistory.RedoCommand, FallbackValue={x:Static cpc:DisabledCommand.Instance}}"
+                  Command="{Binding Session?.ActionHistory?.RedoCommand, TargetNullValue={x:Static cpc:DisabledCommand.Instance}}"
                   HotKey="{x:Static gsvw:MainView.RedoGesture}" InputGesture="{Binding $self.HotKey, Mode=OneTime}"/>
       </MenuItem>
       <!-- Help menu -->
@@ -91,25 +91,25 @@
                                  BorderThickness="2"
                                  BorderBrush="Red"
                                  Padding="2"
-                                 DataContext="{Binding Session.EditorCollection}"/>
+                                 DataContext="{Binding Session?.EditorCollection}"/>
         <GridSplitter Grid.Column="1" ResizeDirection="Auto"/>
         <Grid Grid.Column="2"
               RowDefinitions="Auto, *">
           <StackPanel Grid.Row="0"
                       Orientation="Horizontal">
             <Button Content="{sd:LocalizeString Previous, Context=Button}"
-                    Command="{Binding Session.PreviousSelectionCommand, FallbackValue={x:Static cpc:DisabledCommand.Instance}}"
+                    Command="{Binding Session?.PreviousSelectionCommand, TargetNullValue={x:Static cpc:DisabledCommand.Instance}}"
                     HotKey="Alt+Left" ToolTip.Tip="{Binding $self.HotKey, Mode=OneTime}"/>
             <Button Content="{sd:LocalizeString Next, Context=Button}"
-                    Command="{Binding Session.NextSelectionCommand, FallbackValue={x:Static cpc:DisabledCommand.Instance}}"
+                    Command="{Binding Session?.NextSelectionCommand, TargetNullValue={x:Static cpc:DisabledCommand.Instance}}"
                     HotKey="Alt+Right" ToolTip.Tip="{Binding $self.HotKey, Mode=OneTime}"/>
           </StackPanel>
           <!-- Property Grid -->
           <gsvw:PropertyGridView Grid.Row="1"
                                BorderThickness="2"
                                BorderBrush="Orange"
                                Padding="2"
-                               DataContext="{Binding Session.ActiveProperties, FallbackValue={x:Null}}"/>
+                               DataContext="{Binding Session?.ActiveProperties}"/>
         </Grid>
       </Grid>
       <GridSplitter Grid.Row="1" ResizeDirection="Auto"/>
@@ -128,10 +128,10 @@
             <gsvw:AssetExplorerView BorderThickness="2"
                                   BorderBrush="Blue"
                                   Padding="2"
-                                  DataContext="{Binding Session.AssetCollection, FallbackValue={x:Null}}"/>
+                                  DataContext="{Binding Session?.AssetCollection}"/>
           </TabItem>
           <TabItem Header="Asset errors">
-            <sd:TextLogViewer LogMessages="{Binding Session.AssetLog.FilteredMessages, FallbackValue={x:Null}}"
+            <sd:TextLogViewer LogMessages="{Binding Session?.AssetLog.FilteredMessages}"
                               ShowDebugMessages="False" ShowVerboseMessages="False" ShowInfoMessages="False"/>
           </TabItem>
           <TabItem Header="Output">
@@ -147,7 +147,7 @@
                                  Padding="2"/>
           </TabItem>
           <TabItem Header="Edit history">
-            <ListBox ItemsSource="{Binding Session.ActionHistory.Transactions, FallbackValue={x:Null}}"
+            <ListBox ItemsSource="{Binding Session?.ActionHistory?.Transactions}"
                      HorizontalAlignment="Stretch">
               <ListBox.ItemTemplate>
                 <DataTemplate DataType="caect:TransactionViewModel">
@@ -224,8 +224,8 @@
       <TextBlock Grid.Column="2"
                  Margin="8,0"
                  VerticalAlignment="Center">
-        <Run Text="{Binding Session.AssetCollection.SelectedContent.Count, Mode=OneWay, Converter={sd:Localize Text={}{0} item, Plural={}{0} items, IsStringFormat=True, Context=StatusBar}, FallbackValue={x:Null}}"/>
-        <Run Text="{Binding Session.AssetCollection.SelectedContent.Count, Mode=OneWay, Converter={sd:Localize Text=({0} selected), Plural=({0} selected), IsStringFormat=True, Context=StatusBar}, FallbackValue={x:Null}}"/>
+        <Run Text="{Binding Session?.AssetCollection.SelectedContent.Count, Mode=OneWay, Converter={sd:Localize Text={}{0} item, Plural={}{0} items, IsStringFormat=True, Context=StatusBar}}"/>
+        <Run Text="{Binding Session?.AssetCollection.SelectedContent.Count, Mode=OneWay, Converter={sd:Localize Text=({0} selected), Plural=({0} selected), IsStringFormat=True, Context=StatusBar}}"/>
       </TextBlock>
       <Border Grid.Column="3"
               Margin="2"
@@ -235,16 +235,15 @@
                  Margin="8,0"
                  HorizontalAlignment="Right"
                  VerticalAlignment="Center"
-                 Text="{Binding Status.CurrentJob.Message, FallbackValue={x:Null}}"/>
+                 Text="{Binding Status.CurrentJob?.Message}"/>
       <ProgressBar Grid.Column="5"
                    IsVisible="{Binding Status.CurrentJob, Converter={sd:ObjectToBool}}"
                    Margin="0,2"
                    VerticalAlignment="Stretch"
                    HorizontalAlignment="Left"
-                   IsIndeterminate="{Binding Status.CurrentJob.IsIndeterminate, FallbackValue={x:Null}}"
-                   Maximum="{Binding Status.CurrentJob.Total, FallbackValue={x:Null}}"
-                   Value="{Binding Status.CurrentJob.Current, FallbackValue={x:Null}}"/>
+                   IsIndeterminate="{Binding Status.CurrentJob?.IsIndeterminate, TargetNullValue={sd:True}}"
+                   Maximum="{Binding Status.CurrentJob?.Total, TargetNullValue={sd:Double 0}}"
+                   Value="{Binding Status.CurrentJob?.Current, TargetNullValue={sd:Double 0}}"/>
     </Grid>
   </Grid>
-
 </UserControl>
diff --git a/sources/editor/Stride.GameStudio.Avalonia/Views/PropertyGridView.axaml b/sources/editor/Stride.GameStudio.Avalonia/Views/PropertyGridView.axaml
@@ -105,7 +105,7 @@
   </UserControl.Styles>
   <DockPanel LastChildFill="True">
     <TextBlock DockPanel.Dock="Top" Text="Property Grid"/>
-    <sd:PropertyView ItemsSource="{Binding ViewModel.RootNode.Children}"
+    <sd:PropertyView ItemsSource="{Binding ViewModel?.RootNode.Children}"
                      IsVisible="{Binding CanDisplayProperties}">
       <Interaction.Behaviors>
         <caeb:PropertyViewAutoExpandNodesBehavior ViewModel="{Binding ViewModel, Mode=OneWay}" />
