Fixed bug causing clicks between documents and toolpanes not to register.
This commit is contained in:
parent
2475d90bac
commit
fea6bf6da2
|
@ -25,6 +25,8 @@ namespace Filtration
|
||||||
|
|
||||||
private void Application_Startup(object sender, StartupEventArgs e)
|
private void Application_Startup(object sender, StartupEventArgs e)
|
||||||
{
|
{
|
||||||
|
DispatcherUnhandledException += OnDispatcherUnhandledException;
|
||||||
|
|
||||||
_container = new WindsorContainer();
|
_container = new WindsorContainer();
|
||||||
|
|
||||||
var propInjector = _container.Kernel.ComponentModelBuilder
|
var propInjector = _container.Kernel.ComponentModelBuilder
|
||||||
|
@ -61,7 +63,6 @@ namespace Filtration
|
||||||
Mapper.CreateMap<IThemeViewModel, Theme>();
|
Mapper.CreateMap<IThemeViewModel, Theme>();
|
||||||
|
|
||||||
Mapper.AssertConfigurationIsValid();
|
Mapper.AssertConfigurationIsValid();
|
||||||
DispatcherUnhandledException += OnDispatcherUnhandledException;
|
|
||||||
|
|
||||||
var mainWindow = _container.Resolve<IMainWindow>();
|
var mainWindow = _container.Resolve<IMainWindow>();
|
||||||
mainWindow.Show();
|
mainWindow.Show();
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8" ?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
|
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
|
|
||||||
autoReload="true"
|
autoReload="true"
|
||||||
throwExceptions="false"
|
throwExceptions="false"
|
||||||
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" >
|
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" >
|
||||||
|
|
|
@ -63,6 +63,8 @@ namespace Filtration.ViewModels
|
||||||
get { return _activeDocument; }
|
get { return _activeDocument; }
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
|
if (value == _activeDocument) return;
|
||||||
|
|
||||||
_activeDocument = value;
|
_activeDocument = value;
|
||||||
RaisePropertyChanged();
|
RaisePropertyChanged();
|
||||||
|
|
||||||
|
@ -105,6 +107,7 @@ namespace Filtration.ViewModels
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<IToolViewModel> _tools;
|
private List<IToolViewModel> _tools;
|
||||||
|
private FiltrationViewModelBase _activeContent;
|
||||||
|
|
||||||
public IEnumerable<IToolViewModel> Tools
|
public IEnumerable<IToolViewModel> Tools
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
<Grid>
|
<Grid>
|
||||||
<!-- ReSharper disable once InconsistentNaming -->
|
<!-- ReSharper disable once InconsistentNaming -->
|
||||||
<xcad:DockingManager x:Name="dockManager"
|
<xcad:DockingManager x:Name="dockManager"
|
||||||
AnchorablesSource="{Binding Tools}"
|
AnchorablesSource="{Binding Tools}"
|
||||||
AllowMixedOrientation="True"
|
AllowMixedOrientation="True"
|
||||||
DocumentsSource="{Binding OpenDocuments}"
|
DocumentsSource="{Binding OpenDocuments}"
|
||||||
ActiveContent="{Binding ActiveDocument, Mode=TwoWay, Converter={StaticResource ActiveDocumentConverter}}" >
|
ActiveContent="{Binding ActiveDocument, Mode=TwoWay, Converter={StaticResource ActiveDocumentConverter}}" >
|
||||||
|
|
Loading…
Reference in New Issue