Move concurrent list, fix nesting level issue

jtheisen · Jan 25, 2023 · 1c1f7a4 · 1c1f7a4
1 parent ef0dd78
commit 1c1f7a4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/Moldinium/Misc/ConcurrentList.cs → SampleApp.AspNetMvc/ConcurrentList.cs b/Moldinium/Misc/ConcurrentList.cs → SampleApp.AspNetMvc/ConcurrentList.cs
diff --git a/SampleApp.Wpf/Job.xaml b/SampleApp.Wpf/Job.xaml
@@ -10,7 +10,7 @@
 >
     <StackPanel Orientation="Vertical">
         <Grid Margin="0,2">
-            <TextBlock Margin="{Binding NestingLevel.Level, Converter={StaticResource NestingLevelConverter}}" Text="{Binding StatusString, Converter={StaticResource UpperCaseConverter}}" Style="{StaticResource MaterialDesignButtonTextBlock}" d:Text="qwer" />
+            <TextBlock Margin="{Binding NestingLevel, Converter={StaticResource NestingLevelConverter}}" Text="{Binding StatusString, Converter={StaticResource UpperCaseConverter}}" Style="{StaticResource MaterialDesignButtonTextBlock}" d:Text="qwer" />
         </Grid>
         <ContentControl Content="{Binding}">
             <ContentControl.ContentTemplateSelector>

diff --git a/SampleApp.Wpf/NestingLevelConverter.cs b/SampleApp.Wpf/NestingLevelConverter.cs
@@ -13,14 +13,9 @@ public class NestingLevelConverter : IValueConverter
 
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-            if (value is Int32 nestingLevel)
-            {
-                return new Thickness(Offset + Factor * nestingLevel, 0, 0, 0);
-            }
-            else
-            {
-                return DefaultMargin;
-            }
+            var level = value is JobNestingLevel nestingLevel ? nestingLevel.Level : 0;
+
+            return new Thickness(Offset + Factor * level, 0, 0, 0);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)