From 4e425a33809f8d01cfc2887aaaac77279a5f2fed Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 10 Mar 2019 22:57:52 -0500 Subject: [PATCH] SPARK-2093 Attach/Detach ui --- src/client/spark/Images/Icons.cs | 2 + src/client/spark/Images/Vector/Icons.xaml | 11 +++ .../Trading/OrderBook/OrderBookRowVM.cs | 6 +- .../Modules/Trading/OrderBook/OrderBookVM.cs | 27 +++++- .../Trading/OrderBook/OrderBookWindow.cs | 46 ++++++++- .../OrderBook/View/OrderBookGridView.xaml | 7 -- .../OrderBook/View/OrderBookGridView.xaml.cs | 2 +- .../Trading/OrderBook/View/OrderBookView.xaml | 79 ++++++++++++++- .../OrderBook/View/OrderBookView.xaml.cs | 35 +++++++ .../spark/core/Commands/StatefulCommand.cs | 52 ++++++++++ .../Adorners/DIYGridRowHighlighterAdorner.cs | 96 +++++++++++++++++++ .../view/Extensions/AdornerExtensions.cs | 21 +++- .../Extensions/FrameworkElementExtensions.cs | 15 ++- .../view/Extensions/UIElementExtensions.cs | 6 +- .../spark/view/Extensions/WPFExtensions.cs | 26 +++++ src/client/spark/view/Spark/SparkWindow.cs | 9 +- .../spark/view/Spark/SparkWindowView.xaml.cs | 2 +- 17 files changed, 413 insertions(+), 29 deletions(-) create mode 100644 src/client/spark/core/Commands/StatefulCommand.cs create mode 100644 src/client/spark/view/Controls/Adorners/DIYGridRowHighlighterAdorner.cs diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs index 5ac03d359..6ed365d16 100644 --- a/src/client/spark/Images/Icons.cs +++ b/src/client/spark/Images/Icons.cs @@ -23,6 +23,7 @@ namespace mbts.ui { AddFileGeometryKey = nameof(AddFileGeometryKey), AddFileThinGeometryKey = nameof(AddFileThinGeometryKey), CheckMarkGeometryKey = nameof(CheckMarkGeometryKey), + DetachAlgosGeometryKey = nameof(DetachAlgosGeometryKey), DiskGeometryKey = nameof(DiskGeometryKey), DiskFileGeometryKey = nameof(DiskFileGeometryKey), DocumentGeometryKey = nameof(DocumentGeometryKey), @@ -139,6 +140,7 @@ namespace mbts.ui { public static ImageSource CheckMark => create_icon(CheckMarkGeometryKey); public static ImageSource Clock { get { return load_resource_and_freeze("Clock"); } } public static ImageSource Defrag { get { return load_resource_and_freeze("Defrag"); } } + public static ImageSource DetachAlgos => create_icon(DetachAlgosGeometryKey); public static ImageSource Disk => create_icon(DiskGeometryKey); public static ImageSource DiskFile => create_icon(DiskFileGeometryKey); public static ImageSource Display { get { return load_resource_and_freeze("Display"); } } diff --git a/src/client/spark/Images/Vector/Icons.xaml b/src/client/spark/Images/Vector/Icons.xaml index 9cba2864c..390e381c3 100644 --- a/src/client/spark/Images/Vector/Icons.xaml +++ b/src/client/spark/Images/Vector/Icons.xaml @@ -40,6 +40,17 @@ + + + M32.759,0C14.696,0,0,14.695,0,32.759s14.695,32.759,32.759,32.759s32.759-14.695,32.759-32.759S50.822,0,32.759,0z + M6,32.759C6,18.004,18.004,6,32.759,6c6.648,0,12.734,2.443,17.419,6.472L12.472,50.178C8.443,45.493,6,39.407,6,32.759z + M32.759,59.518c-5.948,0-11.447-1.953-15.895-5.248l37.405-37.405c3.295,4.448,5.248,9.947,5.248,15.895 + C59.518,47.514,47.514,59.518,32.759,59.518z + +