From e66f1bad3aad6de7f63aa9c277b87d8416c08488 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 5 Feb 2018 17:13:36 +0200 Subject: Implemented HiveColorPicker mock on developer module. --- .../Views/MainView.xaml | 39 +++++++++++++++++++--- .../Views/MainView.xaml.cs | 12 ++++++- 2 files changed, 46 insertions(+), 5 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml index 4be818a3e..ae57c2d25 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml @@ -26,7 +26,7 @@ - + + - + + + + + + + SELECT COLOR + + + + + + + + + + + + + + + @@ -734,7 +765,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs index 16427c42b..be24711c1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs @@ -112,7 +112,7 @@ namespace Tango.MachineStudio.Developer.Views private void ColorPickerCombo_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs e) { - UpdateGradientBrushDisplay(); + } private void Offset_Slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs e) @@ -151,5 +151,15 @@ namespace Tango.MachineStudio.Developer.Views { runningJobBrushList.ItemsSource = jobBrushList.ItemsSource; } + + private void HiveColorPickerControl_SelectedColorChanged(object sender, Color e) + { + UpdateGradientBrushDisplay(); + } + + private void Popup_MouseDown(object sender, MouseButtonEventArgs e) + { + e.Handled = true; + } } } -- cgit v1.3.1