From e5fbb7a8df970205e658faaf9157bbbff9e0e6a7 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 7 Feb 2018 16:19:08 -0500 Subject: [PATCH] SPARK-429 Grid filters: select from domain filter should use checkboxes --- .../Filters/Views/FilterTemplates.xaml | 4 +- .../view/Controls/ListBoxEx/ListBoxEx.xaml | 39 ++++++++++++++----- src/client/spark/view/Resources/Common.xaml | 31 ++++++++++----- 3 files changed, 52 insertions(+), 22 deletions(-) diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml b/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml index 45c22f0c7..bae535423 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml +++ b/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml @@ -36,10 +36,10 @@ - + - + diff --git a/src/client/spark/view/Controls/ListBoxEx/ListBoxEx.xaml b/src/client/spark/view/Controls/ListBoxEx/ListBoxEx.xaml index 43b0486b1..72334ea08 100644 --- a/src/client/spark/view/Controls/ListBoxEx/ListBoxEx.xaml +++ b/src/client/spark/view/Controls/ListBoxEx/ListBoxEx.xaml @@ -35,19 +35,35 @@ - - + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -66,6 +82,9 @@ + + + diff --git a/src/client/spark/view/Resources/Common.xaml b/src/client/spark/view/Resources/Common.xaml index d6e5cf288..075bf3f60 100644 --- a/src/client/spark/view/Resources/Common.xaml +++ b/src/client/spark/view/Resources/Common.xaml @@ -2,6 +2,17 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:u="clr-namespace:mbts.ui" xmlns:sys="clr-namespace:System;assembly=mscorlib"> + #FFF3F9FF + #FF5593FF + #FF212121 + #FFE6E6E6 + #FFBCBCBC + #FF707070 + #FFD9ECFF + #FF3C77DD + #FF212121 + #FF212121 + @@ -40,16 +51,16 @@ - - - - - - - - - - + + + + + + + + + +