diff --git a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml
index cc0d9c5ce..e390f8d13 100644
--- a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml
+++ b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml
@@ -193,12 +193,6 @@
-
-
-
diff --git a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml.cs b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml.cs
index 06ca7eda4..0685dba38 100644
--- a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml.cs
+++ b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioView.xaml.cs
@@ -37,27 +37,6 @@ namespace mbts.ui.spark {
public static void SetIsMouseOverNodeContent(DependencyObject d, bool value) => d.SetValue(IsMouseOverNodeContentProperty, value);
#endregion
- #region EnableToggleDefaultOnDoubleClick
- public static readonly DependencyProperty EnableToggleDefaultOnDoubleClickProperty =
- DependencyProperty.RegisterAttached("EnableToggleDefaultOnDoubleClick", typeof(bool), typeof(AlgoStudioView),
- new PropertyMetadata((d, e) => {
- var tvi = (TreeViewItem)d;
- if ((bool)e.NewValue) {
- tvi.MouseDoubleClick += _TreeViewItem_MouseDoubleClick;
- } else {
- tvi.MouseDoubleClick -= _TreeViewItem_MouseDoubleClick;
- }
- }));
-
- static void _TreeViewItem_MouseDoubleClick(object sender, MouseButtonEventArgs e) {
- if (sender is TreeViewItem tvi && tvi.DataContext is AlgoDefinitionTemplateVM tmp)
- tmp.is_default = true;
- }
-
- public static bool GetEnableToggleDefaultOnDoubleClick(DependencyObject d) => (bool)d.GetValue(EnableToggleDefaultOnDoubleClickProperty);
- public static void SetEnableToggleDefaultOnDoubleClick(DependencyObject d, bool value) => d.SetValue(EnableToggleDefaultOnDoubleClickProperty, value);
- #endregion
-
public new AlgoStudioVM DataContext {
get => base.DataContext as AlgoStudioVM;
set => base.DataContext = value;
diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionTemplateVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionTemplateVM.cs
index 8a118575a..29b63d926 100644
--- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionTemplateVM.cs
+++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionTemplateVM.cs
@@ -1,9 +1,11 @@
using bts.api.orderman;
using bts.utils;
using mbts.spark.utilities;
+using mbts.ui;
using mbts.ui.shell;
using mbts.utils;
using System;
+using System.Windows.Input;
namespace mbts.spark {
class AlgoDefinitionTemplateVM : DisposableViewModelBase, IAlgoStudioContentVM, IEquatable {
@@ -47,6 +49,11 @@ namespace mbts.spark {
_edit_stack.push(_committed);
_can_redo = backing(nameof(can_redo), () => _edit_stack.get_can_redo(_version.value));
_can_undo = backing(nameof(can_undo), () => _edit_stack.get_can_undo(_version.value));
+ set_as_default_cmd = new DelegateCommand(() => {
+ // don't call the model if it is already the default - as of 1/21/2019, it's an async call, is not idemptotent, and pumps an observable notification to every ladder/algostudio window.
+ if (!is_default && vm_key.mode == AlgoVMKey.Mode.Persisted)
+ _model.algo_model.set_as_default(owner.vm_key.persisted_id, vm_key.persisted_id).ignore();
+ });
algo_root.definition_changed += _change_logger.execute;
_can_redo.Changed += on_can_redo_changed;
_can_undo.Changed += on_can_undo_changed;
@@ -100,13 +107,7 @@ namespace mbts.spark {
public bool is_dirty => _is_dirty.Value;
public bool can_redo => _can_redo.Value;
public bool can_undo => _can_undo.Value;
- public bool is_default {
- get => _is_default.Value;
- set {
- if (_is_default.set_new(value) && value && vm_key.mode == AlgoVMKey.Mode.Persisted)
- _model.algo_model.set_as_default(owner.vm_key.persisted_id, vm_key.persisted_id).ignore();
- }
- }
+ public bool is_default => _is_default.Value;
public bool is_favorite {
get => _is_favorite.Value;
set {
@@ -121,6 +122,7 @@ namespace mbts.spark {
public bool is_selected { get => _is_selected.Value; set => _is_selected.set(value); }
public bool is_expanded => false;
public bool is_persisted => vm_key.mode == AlgoVMKey.Mode.Persisted;
+ public ICommand set_as_default_cmd { get; }
public AlgoTemplateData create() =>
create(owner.create_algo_def());
diff --git a/src/client/spark/view/Controls/Order/AlgoTemplateTreeView.xaml b/src/client/spark/view/Controls/Order/AlgoTemplateTreeView.xaml
index a9f04adbf..900dbef61 100644
--- a/src/client/spark/view/Controls/Order/AlgoTemplateTreeView.xaml
+++ b/src/client/spark/view/Controls/Order/AlgoTemplateTreeView.xaml
@@ -123,8 +123,7 @@
-
+
+
+
+