diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppNotification.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppNotification.xaml index f9183960..7cbb4c85 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppNotification.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppNotification.xaml @@ -3,6 +3,8 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:hc="https://handyorg.github.io/handycontrol" Background="White" + BorderThickness="1" + BorderBrush="{DynamicResource BorderBrush}" Width="320" Height="518"> diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs index 8e005cf1..e5ed3be9 100644 --- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs +++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs @@ -21,7 +21,11 @@ namespace HandyControlDemo.ViewModel public ShowAnimation ShowAnimation { get => _showAnimation; +#if netle40 + set => Set(nameof(ShowAnimation) ,ref _showAnimation, value); +#else set => Set(ref _showAnimation, value); +#endif } private bool _staysOpen = true; @@ -29,7 +33,11 @@ namespace HandyControlDemo.ViewModel public bool StaysOpen { get => _staysOpen; +#if netle40 + set => Set(nameof(StaysOpen) ,ref _staysOpen, value); +#else set => Set(ref _staysOpen, value); +#endif } } } diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Notification.cs b/src/Shared/HandyControl_Shared/Controls/Other/Notification.cs index 11a05e84..9b911b21 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/Notification.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/Notification.cs @@ -1,6 +1,5 @@ using System; using System.ComponentModel; -using System.Threading.Tasks; using System.Windows; using System.Windows.Threading; using HandyControl.Data; @@ -60,7 +59,7 @@ namespace HandyControl.Controls notification.Top = topMax; notification.BeginAnimation(LeftProperty, AnimationHelper.CreateAnimation(leftMax)); break; - case ShowAnimation.verticalMove: + case ShowAnimation.VerticalMove: notification.Opacity = 1; notification.Left = leftMax; notification.Top = desktopWorkingArea.Height; @@ -106,7 +105,7 @@ namespace HandyControl.Controls _shouldBeClosed = true; } break; - case ShowAnimation.verticalMove: + case ShowAnimation.VerticalMove: { var animation = AnimationHelper.CreateAnimation(desktopWorkingArea.Height); animation.Completed += Animation_Completed; diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ShowAnimation.cs b/src/Shared/HandyControl_Shared/Data/Enum/ShowAnimation.cs index ba230aae..52e56c3f 100644 --- a/src/Shared/HandyControl_Shared/Data/Enum/ShowAnimation.cs +++ b/src/Shared/HandyControl_Shared/Data/Enum/ShowAnimation.cs @@ -4,7 +4,7 @@ { None, HorizontalMove, - verticalMove, + VerticalMove, Fade } } \ No newline at end of file