update to v1.3.2

This commit is contained in:
NaBian committed 2018-10-10 16:38:52 +08:00
1 parent bd3608a73e
commit ac3e41e9e6
57 files changed
+634 -318

No files matched your search

+7 -7
View File
@@ -1,5 +1,4 @@
using System;
using System.Windows;
using System.Windows.Controls;
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.CommandWpf;
@@ -57,9 +56,9 @@ namespace HandyControlDemo.ViewModel
/// <summary>
/// 切换例子命令
/// </summary>
public RelayCommand<RoutedPropertyChangedEventArgs<object>> SwitchDemoCmd =>
new Lazy<RelayCommand<RoutedPropertyChangedEventArgs<object>>>(() =>
new RelayCommand<RoutedPropertyChangedEventArgs<object>>(SwitchDemo)).Value;
public RelayCommand<SelectionChangedEventArgs> SwitchDemoCmd =>
new Lazy<RelayCommand<SelectionChangedEventArgs>>(() =>
new RelayCommand<SelectionChangedEventArgs>(SwitchDemo)).Value;
#endregion
@@ -68,13 +67,14 @@ namespace HandyControlDemo.ViewModel
/// <summary>
/// 切换例子
/// </summary>
private void SwitchDemo(RoutedPropertyChangedEventArgs<object> e)
private void SwitchDemo(SelectionChangedEventArgs e)
{
if (e.NewValue is TreeViewItem item)
if (e.AddedItems.Count == 0) return;
if (e.AddedItems[0] is ListBoxItem item)
{
if (item.Tag is string tag)
{
ContentTitle = item.Header;
ContentTitle = item.Content;
Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{tag}"), MessageToken.LoadShowContent);
}
else