diff --git a/HandyControl/Controls/Cover/CoverView/CoverView.cs b/HandyControl/Controls/Cover/CoverView/CoverView.cs index 38741cc8..ef0d8483 100644 --- a/HandyControl/Controls/Cover/CoverView/CoverView.cs +++ b/HandyControl/Controls/Cover/CoverView/CoverView.cs @@ -182,6 +182,7 @@ namespace HandyControl.Controls _viewContent.ManualHeight = 0; if (_viewContent.Content is FrameworkElement element) { + element.VerticalAlignment = VerticalAlignment.Top; element.Arrange(new Rect(new Size(double.MaxValue, double.MaxValue))); _viewContent.ManualHeight = element.ActualHeight; } diff --git a/HandyControl/Themes/Styles/Base/CoverViewBaseStyle.xaml b/HandyControl/Themes/Styles/Base/CoverViewBaseStyle.xaml index 92d44f56..cb75d0f5 100644 --- a/HandyControl/Themes/Styles/Base/CoverViewBaseStyle.xaml +++ b/HandyControl/Themes/Styles/Base/CoverViewBaseStyle.xaml @@ -38,7 +38,7 @@ - + diff --git a/HandyControlDemo/ViewModel/Basic/ChatBoxViewModel.cs b/HandyControlDemo/ViewModel/Basic/ChatBoxViewModel.cs index 53b2cb21..aa959105 100644 --- a/HandyControlDemo/ViewModel/Basic/ChatBoxViewModel.cs +++ b/HandyControlDemo/ViewModel/Basic/ChatBoxViewModel.cs @@ -4,7 +4,6 @@ using System.Diagnostics; using System.IO; using System.Media; using System.Windows; -using System.Windows.Controls; using System.Windows.Input; using System.Windows.Media.Imaging; using GalaSoft.MvvmLight; @@ -21,7 +20,7 @@ namespace HandyControlDemo.ViewModel { public class ChatBoxViewModel : ViewModelBase { - private static readonly string AutioCachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache"; + private static readonly string AudioCachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache"; private readonly string _id = Guid.NewGuid().ToString(); @@ -113,11 +112,11 @@ namespace HandyControlDemo.ViewModel private void StopRecord() { - if (!Directory.Exists(AutioCachePath)) + if (!Directory.Exists(AudioCachePath)) { try { - Directory.CreateDirectory(AutioCachePath); + Directory.CreateDirectory(AudioCachePath); } catch (Exception e) { @@ -126,7 +125,7 @@ namespace HandyControlDemo.ViewModel } } - var cachePath = $"{AutioCachePath}\\{Guid.NewGuid().ToString()}"; + var cachePath = $"{AudioCachePath}\\{Guid.NewGuid().ToString()}"; ExternDllHelper.MciSendString("stop movie", "", 0, 0); ExternDllHelper.MciSendString($"save movie {cachePath}", "", 0, 0); ExternDllHelper.MciSendString("close movie", "", 0, 0); diff --git a/Net40/HandyControlDemo_Net40/ViewModel/Basic/ChatBoxViewModel.cs b/Net40/HandyControlDemo_Net40/ViewModel/Basic/ChatBoxViewModel.cs index fb50686b..17cce6c0 100644 --- a/Net40/HandyControlDemo_Net40/ViewModel/Basic/ChatBoxViewModel.cs +++ b/Net40/HandyControlDemo_Net40/ViewModel/Basic/ChatBoxViewModel.cs @@ -20,7 +20,7 @@ namespace HandyControlDemo.ViewModel { public class ChatBoxViewModel : ViewModelBase { - private static readonly string AutioCachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache"; + private static readonly string AudioCachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache"; private readonly string _id = Guid.NewGuid().ToString(); @@ -112,11 +112,11 @@ namespace HandyControlDemo.ViewModel private void StopRecord() { - if (!Directory.Exists(AutioCachePath)) + if (!Directory.Exists(AudioCachePath)) { try { - Directory.CreateDirectory(AutioCachePath); + Directory.CreateDirectory(AudioCachePath); } catch (Exception e) { @@ -125,7 +125,7 @@ namespace HandyControlDemo.ViewModel } } - var cachePath = $"{AutioCachePath}\\{Guid.NewGuid().ToString()}"; + var cachePath = $"{AudioCachePath}\\{Guid.NewGuid().ToString()}"; ExternDllHelper.MciSendString("stop movie", "", 0, 0); ExternDllHelper.MciSendString($"save movie {cachePath}", "", 0, 0); ExternDllHelper.MciSendString("close movie", "", 0, 0); diff --git a/Net40/HandyControl_Net40/Controls/Cover/CoverView/CoverView.cs b/Net40/HandyControl_Net40/Controls/Cover/CoverView/CoverView.cs index 38741cc8..ef0d8483 100644 --- a/Net40/HandyControl_Net40/Controls/Cover/CoverView/CoverView.cs +++ b/Net40/HandyControl_Net40/Controls/Cover/CoverView/CoverView.cs @@ -182,6 +182,7 @@ namespace HandyControl.Controls _viewContent.ManualHeight = 0; if (_viewContent.Content is FrameworkElement element) { + element.VerticalAlignment = VerticalAlignment.Top; element.Arrange(new Rect(new Size(double.MaxValue, double.MaxValue))); _viewContent.ManualHeight = element.ActualHeight; } diff --git a/Net40/HandyControl_Net40/Themes/Styles/Base/CoverViewBaseStyle.xaml b/Net40/HandyControl_Net40/Themes/Styles/Base/CoverViewBaseStyle.xaml index 92d44f56..cb75d0f5 100644 --- a/Net40/HandyControl_Net40/Themes/Styles/Base/CoverViewBaseStyle.xaml +++ b/Net40/HandyControl_Net40/Themes/Styles/Base/CoverViewBaseStyle.xaml @@ -38,7 +38,7 @@ - +