Fixed bug causing clicks between documents and toolpanes not to register.

This commit is contained in:
Ben 2015-07-04 12:24:50 +01:00
parent 2475d90bac
commit fea6bf6da2
4 changed files with 6 additions and 3 deletions

View File

@ -25,6 +25,8 @@ namespace Filtration
private void Application_Startup(object sender, StartupEventArgs e)
{
DispatcherUnhandledException += OnDispatcherUnhandledException;
_container = new WindsorContainer();
var propInjector = _container.Kernel.ComponentModelBuilder
@ -61,7 +63,6 @@ namespace Filtration
Mapper.CreateMap<IThemeViewModel, Theme>();
Mapper.AssertConfigurationIsValid();
DispatcherUnhandledException += OnDispatcherUnhandledException;
var mainWindow = _container.Resolve<IMainWindow>();
mainWindow.Show();

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
autoReload="true"
throwExceptions="false"
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" >

View File

@ -63,6 +63,8 @@ namespace Filtration.ViewModels
get { return _activeDocument; }
set
{
if (value == _activeDocument) return;
_activeDocument = value;
RaisePropertyChanged();
@ -105,6 +107,7 @@ namespace Filtration.ViewModels
}
private List<IToolViewModel> _tools;
private FiltrationViewModelBase _activeContent;
public IEnumerable<IToolViewModel> Tools
{

View File

@ -20,7 +20,7 @@
<Grid>
<!-- ReSharper disable once InconsistentNaming -->
<xcad:DockingManager x:Name="dockManager"
AnchorablesSource="{Binding Tools}"
AnchorablesSource="{Binding Tools}"
AllowMixedOrientation="True"
DocumentsSource="{Binding OpenDocuments}"
ActiveContent="{Binding ActiveDocument, Mode=TwoWay, Converter={StaticResource ActiveDocumentConverter}}" >