diff --git a/Filtration.Common/Filtration.Common.csproj b/Filtration.Common/Filtration.Common.csproj
index e48730c..ad88961 100644
--- a/Filtration.Common/Filtration.Common.csproj
+++ b/Filtration.Common/Filtration.Common.csproj
@@ -66,6 +66,24 @@
+
+ ..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.dll
+
+
+ ..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll
+
+
+ ..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll
+
+
+ ..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
+
+
+ ..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.DataGrid.dll
+
+
+ ..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.Toolkit.dll
+
@@ -80,6 +98,8 @@
+
+
diff --git a/Filtration/Views/PathOfExileColors.cs b/Filtration.Common/Utilities/PathOfExileColors.cs
similarity index 97%
rename from Filtration/Views/PathOfExileColors.cs
rename to Filtration.Common/Utilities/PathOfExileColors.cs
index 0485dea..de53179 100644
--- a/Filtration/Views/PathOfExileColors.cs
+++ b/Filtration.Common/Utilities/PathOfExileColors.cs
@@ -2,9 +2,9 @@
using System.Windows.Media;
using Xceed.Wpf.Toolkit;
-namespace Filtration.Views
+namespace Filtration.Common.Utilities
{
- internal static class PathOfExileColors
+ public static class PathOfExileColors
{
static PathOfExileColors()
{
diff --git a/Filtration/Utility/VisualTreeUtility.cs b/Filtration.Common/Utilities/VisualTreeUtility.cs
similarity index 94%
rename from Filtration/Utility/VisualTreeUtility.cs
rename to Filtration.Common/Utilities/VisualTreeUtility.cs
index 79ddec4..0d3b3b0 100644
--- a/Filtration/Utility/VisualTreeUtility.cs
+++ b/Filtration.Common/Utilities/VisualTreeUtility.cs
@@ -1,7 +1,7 @@
using System.Windows;
using System.Windows.Media;
-namespace Filtration.Utility
+namespace Filtration.Common.Utilities
{
public class VisualTreeUtility
{
diff --git a/Filtration.Common/packages.config b/Filtration.Common/packages.config
index 5df631c..b679442 100644
--- a/Filtration.Common/packages.config
+++ b/Filtration.Common/packages.config
@@ -3,5 +3,6 @@
+
\ No newline at end of file
diff --git a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
index 6941c83..cde6dbc 100644
--- a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
+++ b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj
@@ -158,6 +158,9 @@
+
+
+
-
-
+
+
diff --git a/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml.cs b/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml.cs
index 9377630..5e3dc42 100644
--- a/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml.cs
+++ b/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml.cs
@@ -1,4 +1,6 @@
-namespace Filtration.ThemeEditor.Views
+using System.Windows.Input;
+
+namespace Filtration.ThemeEditor.Views
{
public partial class ThemeComponentControl
{
@@ -6,5 +8,13 @@
{
InitializeComponent();
}
+
+ private void ColorPicker_OnMouseDown(object sender, MouseButtonEventArgs e)
+ {
+ // For some reason if we don't mark OnMouseDown events as handled for this control
+ // it ignores them and they end up getting picked up by the parent ListBoxItem instead,
+ // resulting in the Advanced tab not being clickable.
+ e.Handled = true;
+ }
}
}
diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index d63e6d7..0a74b8a 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -247,7 +247,6 @@
ThemeComponentSelectionControl.xaml
-
@@ -279,7 +278,6 @@
-
SettingsPageView.xaml
diff --git a/Filtration/Filtration.nuspec b/Filtration/Filtration.nuspec
index b822391..92cc424 100644
--- a/Filtration/Filtration.nuspec
+++ b/Filtration/Filtration.nuspec
@@ -17,6 +17,7 @@
* New buttons for adding/removing DisableDropSound from selected blocks have been added (#110)
* The Enable/Disable Block toggle button is now visible on both the Regular Block Items and Appearance Block Items views
* When there are too many block items to fit horizontally in a block a horizontal scrollbar will now appear
+* Fixed the Advanced tab in the Color Picker in the Theme Editor not being clickable (#115)
* Fixed the previously incorrect handling of DisableDropSound as a true/false value when in fact it is enabled/disabled purely by its presence or lack thereof in a block (#111)
* Fixed the application freezing for a long period of time when Ctrl+A (Select All) is performed
* Fixed the Switch to Appearance/Regular Block Items text overlapping block items
diff --git a/Filtration/UserControls/BlockItemControl.xaml b/Filtration/UserControls/BlockItemControl.xaml
index c5ef873..5be1988 100644
--- a/Filtration/UserControls/BlockItemControl.xaml
+++ b/Filtration/UserControls/BlockItemControl.xaml
@@ -11,6 +11,7 @@
xmlns:enums="clr-namespace:Filtration.ObjectModel.Enums;assembly=Filtration.ObjectModel"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:views="clr-namespace:Filtration.Views"
+ xmlns:utilities="clr-namespace:Filtration.Common.Utilities;assembly=Filtration.Common"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance Type=userControls:BlockItemControl}"
d:DesignHeight="200" d:DesignWidth="190">
@@ -117,7 +118,7 @@
-
+
diff --git a/Filtration/UserControls/BlockItemControl.xaml.cs b/Filtration/UserControls/BlockItemControl.xaml.cs
index db0909c..da13135 100644
--- a/Filtration/UserControls/BlockItemControl.xaml.cs
+++ b/Filtration/UserControls/BlockItemControl.xaml.cs
@@ -1,16 +1,13 @@
using System.Collections.Generic;
-using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Runtime.CompilerServices;
using System.Windows;
using Filtration.Annotations;
using Filtration.ObjectModel;
using Filtration.ObjectModel.BlockItemBaseTypes;
-using Filtration.ObjectModel.Enums;
-using Filtration.ObjectModel.ThemeEditor;
-using Filtration.Views;
+using Filtration.ObjectModel.Enums;
+using Filtration.ObjectModel.ThemeEditor;
using GalaSoft.MvvmLight.CommandWpf;
-using Xceed.Wpf.Toolkit;
namespace Filtration.UserControls
{
@@ -81,9 +78,6 @@ namespace Filtration.UserControls
}
}
-
- public ObservableCollection AvailableColors => PathOfExileColors.DefaultColors;
-
public List SoundsAvailable => new List {
"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16",
"ShGeneral", "ShBlessed", "ShChaos", "ShDivine", "ShExalted", "ShMirror", "ShAlchemy",
diff --git a/Filtration/ViewModels/DesignTime/DesignTimeItemFilterBlockViewModel.cs b/Filtration/ViewModels/DesignTime/DesignTimeItemFilterBlockViewModel.cs
index a8c4013..5b6ff39 100644
--- a/Filtration/ViewModels/DesignTime/DesignTimeItemFilterBlockViewModel.cs
+++ b/Filtration/ViewModels/DesignTime/DesignTimeItemFilterBlockViewModel.cs
@@ -139,7 +139,6 @@ namespace Filtration.ViewModels.DesignTime
typeof (HasExplicitModBlockItem)
};
public List AudioVisualBlockItemTypesAvailable { get; }
- public ObservableCollection AvailableColors { get; }
public Color DisplayTextColor => Colors.Red;
public Color DisplayBackgroundColor => Colors.White;
public Color DisplayBorderColor => Colors.GreenYellow;
diff --git a/Filtration/ViewModels/ItemFilterBlockViewModel.cs b/Filtration/ViewModels/ItemFilterBlockViewModel.cs
index 7a8c056..5403e5f 100644
--- a/Filtration/ViewModels/ItemFilterBlockViewModel.cs
+++ b/Filtration/ViewModels/ItemFilterBlockViewModel.cs
@@ -54,7 +54,6 @@ namespace Filtration.ViewModels
IEnumerable AutocompleteItemMods { get; }
List BlockItemTypesAvailable { get; }
List AudioVisualBlockItemTypesAvailable { get; }
- ObservableCollection AvailableColors { get; }
Color DisplayTextColor { get; }
Color DisplayBackgroundColor { get; }
Color DisplayBorderColor { get; }
@@ -276,8 +275,6 @@ namespace Filtration.ViewModels
}
}
- public ObservableCollection AvailableColors => PathOfExileColors.DefaultColors;
-
public Color DisplayTextColor => Block.DisplayTextColor;
public Color DisplayBackgroundColor => Block.DisplayBackgroundColor;
public Color DisplayBorderColor => Block.DisplayBorderColor;
diff --git a/Filtration/ViewModels/ReplaceColorsViewModel.cs b/Filtration/ViewModels/ReplaceColorsViewModel.cs
index e1f43ee..5b84a04 100644
--- a/Filtration/ViewModels/ReplaceColorsViewModel.cs
+++ b/Filtration/ViewModels/ReplaceColorsViewModel.cs
@@ -1,12 +1,9 @@
-using System.Collections.ObjectModel;
-using System.Linq;
+using System.Linq;
using System.Windows.Media;
using Filtration.ObjectModel;
using Filtration.ObjectModel.BlockItemTypes;
-using Filtration.Views;
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.CommandWpf;
-using Xceed.Wpf.Toolkit;
namespace Filtration.ViewModels
{
@@ -62,8 +59,6 @@ namespace Filtration.ViewModels
_itemFilterScript = itemFilterScript;
}
- public ObservableCollection AvailableColors => PathOfExileColors.DefaultColors;
-
public Color NewTextColor
{
get => _replaceColorsParameterSet.NewTextColor;
diff --git a/Filtration/Views/ItemFilterBlockView.xaml.cs b/Filtration/Views/ItemFilterBlockView.xaml.cs
index 59f51df..b7f7c6b 100644
--- a/Filtration/Views/ItemFilterBlockView.xaml.cs
+++ b/Filtration/Views/ItemFilterBlockView.xaml.cs
@@ -2,8 +2,8 @@
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
+using Filtration.Common.Utilities;
using Filtration.UserControls;
-using Filtration.Utility;
namespace Filtration.Views
{
diff --git a/Filtration/Views/ReplaceColorsWindow.xaml b/Filtration/Views/ReplaceColorsWindow.xaml
index 7a06e44..8e15527 100644
--- a/Filtration/Views/ReplaceColorsWindow.xaml
+++ b/Filtration/Views/ReplaceColorsWindow.xaml
@@ -6,6 +6,7 @@
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:viewModels="clr-namespace:Filtration.ViewModels"
xmlns:userControls="clr-namespace:Filtration.UserControls"
+ xmlns:utilities="clr-namespace:Filtration.Common.Utilities;assembly=Filtration.Common"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance Type=viewModels:ReplaceColorsViewModel}"
Title="Replace Script Colors" Height="280" Width="540"
@@ -31,22 +32,22 @@
Existing Text Color
-
+
New Text Color
-
+
Existing Background Color
-
+
New Background Color
-
+
Existing Border Color
-
+
New Border Color
-
+
Preview