Fixed issue with progressbar

StefanKert · Apr 5, 2019 · 00b0fe6 · 00b0fe6
1 parent 08b6200
commit 00b0fe6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/src/BuildVision.UI/Components/ControlView.xaml b/src/BuildVision.UI/Components/ControlView.xaml
@@ -74,7 +74,7 @@
                     VerticalAlignment="Center" />
             </Grid>
 
-            <controls:BuildVisionProgressBar DataContext="{Binding BuildInformationModel.CurrentBuildState}" />
+            <controls:BuildVisionProgressBar DataContext="{Binding BuildInformationModel}" />
 
             <Grid Visibility="{Binding ControlSettings.GeneralSettings.IndicatorsPanelVisible,
                                        Converter={StaticResource BoolToVisibilityConverter}}">

diff --git a/src/BuildVision.UI/Components/ControlView.xaml.cs b/src/BuildVision.UI/Components/ControlView.xaml.cs
@@ -54,6 +54,5 @@ private void ViewModelOnPropertyChanged(object sender, PropertyChangedEventArgs
             //        Grid.ScrollIntoView(_viewModel.CurrentProject);
             //}
         }
-
     }
 }
diff --git a/src/BuildVision.UI/Components/ProjectGrid.xaml.cs b/src/BuildVision.UI/Components/ProjectGrid.xaml.cs
@@ -55,8 +55,6 @@ private void GridOnSorting(object sender, DataGridSortingEventArgs e)
 
         private void OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
-            Debug.Assert(DataContext != null);
-
             _viewModel = (BuildVisionPaneViewModel) DataContext;
             _viewModel.SetGridColumnsRef(Grid.Columns);
             _viewModel.PropertyChanged += ViewModelOnPropertyChanged;

diff --git a/src/BuildVision.UI/Controls/BuildVisionProgressBar.xaml b/src/BuildVision.UI/Controls/BuildVisionProgressBar.xaml
@@ -5,7 +5,16 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              mc:Ignorable="d"
              xmlns:contracts="clr-namespace:BuildVision.Contracts;assembly=BuildVision.Contracts"
-             d:DesignWidth="697">
+             xmlns:models="clr-namespace:BuildVision.UI.Models"
+             d:DesignWidth="697"
+             d:DataContext="{Binding Source={StaticResource DesignViewModel}}">
+    <UserControl.Resources>
+        <ResourceDictionary>
+
+            <models:BuildInformationModel x:Key="DesignViewModel"/>
+
+        </ResourceDictionary>
+    </UserControl.Resources>
     <Grid>
         <Line Name="Line"
                   Margin="0,3,3,3"
@@ -35,7 +44,7 @@
             <Line.Style>
                 <Style>
                     <Style.Triggers>
-                        <DataTrigger Binding="{Binding}" Value="{x:Static contracts:BuildState.InProgress}">
+                        <DataTrigger Binding="{Binding CurrentBuildState}" Value="{x:Static contracts:BuildState.InProgress}">
                             <DataTrigger.EnterActions>
                                 <BeginStoryboard x:Name="LineProgressBeginStoryboard">
                                     <Storyboard>
-Original file line number
+Diff line change
@@ Expand Up @@
                 //        Grid.ScrollIntoView(_viewModel.CurrentProject);
                 //}
             }
         }
     }