diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-06-11 11:26:47 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-06-11 11:26:47 +0300 |
| commit | 23600da8f47bde5e0916b0bea3edb17b9911c654 (patch) | |
| tree | 8a1a685c6e66eaad5e9df0993f628ca842fee00d /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls | |
| parent | 51d7c41cbbec95d2428a270b3f585011aa9babf3 (diff) | |
| parent | b21d8e7c164b63d14d15cfdf3dda68ae88a03043 (diff) | |
| download | Tango-23600da8f47bde5e0916b0bea3edb17b9911c654.tar.gz Tango-23600da8f47bde5e0916b0bea3edb17b9911c654.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls')
2 files changed, 0 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs index b8ebe9f6a..26629003a 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs @@ -26,7 +26,6 @@ namespace Tango.MachineStudio.Common.Controls public event EventHandler<Color> SelectedHiveColorChanged; public event EventHandler<HexagonControl> SelectedHexagonChanged; public event EventHandler<int> LAxisValueChanged; - public event EventHandler<int> ResolutionChanged; private bool _preventColorCanvasEvent; diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml.cs index ceba52826..baa44bc28 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml.cs @@ -23,7 +23,6 @@ namespace Tango.MachineStudio.Common.Controls /// </summary> public partial class HiveComboControl : UserControl { - public event EventHandler<Color> SelectedColorChanged; public event EventHandler<HexagonControl> SelectedHexagonChanged; public event EventHandler<int> LAxisValueChanged; public event EventHandler<int> ResolutionChanged; |