Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 23 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
index b48e91f31..bb17a502d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
@@ -242,5 +242,28 @@ namespace Tango.MachineStudio.Developer.Views
                 editor.ParameterizedObject = draggedItem.ParameterizedObject;
             }
         }
+
+        private void PopupButton_Checked(object sender, RoutedEventArgs e)
+        {
+            _vm.OnHivePopupOpened();
+        }
+
+        private void BrushPicker_ColorChanged(object sender, BrushPicker.ColorChangedEventArgs e)
+        {
+           
+        }
+
+        private void ColorCanvas_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
+        {
+            if (e.NewValue.HasValue)
+            {
+                _vm.OnSelectedBrushColorChanged((Color)e.NewValue);
+            }
+        }
+
+        private void PopupButton_Unchecked(object sender, RoutedEventArgs e)
+        {
+            _vm.OnHivePopupClosed();
+        }
     }
 }