Additional fixes.

Moved Projectgrid to seperate usercontrol
StefanKert · Mar 16, 2019 · c284def · c284def
1 parent edfb460
commit c284def
Show file tree

Hide file tree

Showing 13 changed files with 516 additions and 428 deletions.
diff --git a/src/BuildVision.Contracts/Models/IBuildProgressViewModel.cs b/src/BuildVision.Contracts/Models/IBuildProgressViewModel.cs
@@ -3,7 +3,6 @@
     public interface IBuildProgressViewModel
     {
         bool ActionProgressIsPaused { get; set; }
-        bool ActionProgressIsVisible { get; set; }
         int CurrentQueuePosOfBuildingProject { get; }
 
         void OnBuildBegin(int projectsCount);

diff --git a/src/BuildVision.UI/BuildVision.UI.csproj b/src/BuildVision.UI/BuildVision.UI.csproj
@@ -73,6 +73,9 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Components\ProjectGrid.xaml.cs">
+      <DependentUpon>ProjectGrid.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Controls\BuildVisionProgressBar.xaml.cs">
       <DependentUpon>BuildVisionProgressBar.xaml</DependentUpon>
     </Compile>
@@ -228,6 +231,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Components\ProjectGrid.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Components\SpinnerControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

diff --git a/src/BuildVision.UI/Components/ControlView.xaml b/src/BuildVision.UI/Components/ControlView.xaml
diff --git a/src/BuildVision.UI/Components/ControlView.xaml.cs b/src/BuildVision.UI/Components/ControlView.xaml.cs
@@ -37,31 +37,11 @@ public ControlView()
             //Grid.TargetUpdated += GridOnTargetUpdated;
         }
 
-        private void GridOnTargetUpdated(object sender, DataTransferEventArgs e)
-        {
-            if (e.Property.Name == "ItemsSource")
-                RefreshSortDirectionInGrid();
-        }
-
-        private void RefreshSortDirectionInGrid()
-        {
-            //DataGridColumn dataGridColumn = Grid.Columns.FirstOrDefault(col => col.GetBindedProperty() == _viewModel.GridSortDescription.Property);
-            //if (dataGridColumn != null)
-            //    dataGridColumn.SortDirection = _viewModel.GridSortDescription.Order.ToSystem();
-        }
-
-        private void GridOnSorting(object sender, DataGridSortingEventArgs e)
-        {
-            if (_viewModel.GridSorting.CanExecute(e))
-                _viewModel.GridSorting.Execute(e);
-        }
-
         private void OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
             Debug.Assert(DataContext != null);
 
-            _viewModel = (BuildVisionPaneViewModel)DataContext;
-            //_viewModel.SetGridColumnsRef(Grid.Columns);
+            _viewModel = (BuildVisionPaneViewModel) DataContext;
             _viewModel.PropertyChanged += ViewModelOnPropertyChanged;
         }
 
@@ -78,64 +58,5 @@ private void ViewModelOnPropertyChanged(object sender, PropertyChangedEventArgs
             //}
         }
 
-        private void DataGridExpanderOnExpanded(object sender, RoutedEventArgs e)
-        {
-            ExpanderIsExpandedConverter.SaveState(
-                (Expander)sender,
-                false,
-                _viewModel.ControlSettings.GridSettings.CollapsedGroups);
-            e.Handled = true;
-        }
-
-        private void DataGridExpanderOnCollapsed(object sender, RoutedEventArgs e)
-        {
-            ExpanderIsExpandedConverter.SaveState(
-                (Expander)sender,
-                true,
-                _viewModel.ControlSettings.GridSettings.CollapsedGroups);
-            e.Handled = true;
-        }
-
-        // Send scrolling to the DataGrid.
-        private void DataGridExpanderOnPreviewMouseWheel(object sender, MouseWheelEventArgs e)
-        {
-            e.Handled = true;
-            var eventArg = new MouseWheelEventArgs(e.MouseDevice, e.Timestamp, e.Delta)
-                               {
-                                    RoutedEvent = MouseWheelEvent, 
-                                    Source = sender
-                               };
-
-            var parent = (UIElement)VisualTreeHelper.GetParent((DependencyObject)sender);
-            parent.RaiseEvent(eventArg);
-        }
-
-        private void DataGridRowDetailsOnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            // http://stackoverflow.com/questions/6279724/mousedoubleclick-events-dont-bubble/6326181#6326181)
-            if (e.ClickCount == 2)
-                e.Handled = true;
-        }
-
-        // Autofocus for RowDetails (without extra mouse click).
-        private void DataGridRowOnPreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            var row = (DataGridRow)sender;
-            if (!row.IsSelected && e.Source is DataGridDetailsPresenter)
-            {
-                row.Focusable = true;
-                row.Focus();
-
-                // Gets the element with keyboard focus.
-                var elementWithFocus = Keyboard.FocusedElement as UIElement;
-
-                // Change keyboard focus.
-                if (elementWithFocus != null)
-                {
-                    var request = new TraversalRequest(FocusNavigationDirection.Next);
-                    elementWithFocus.MoveFocus(request);
-                }
-            }
-        }
     }
 }