chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a bug of CoverView

Browse Source
This commit is contained in:
NaBian committed 2019-02-12 10:23:20 +08:00
1 parent ab6e2efe21
commit b179d90aa1
6 files changed
+12 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

HandyControl/Controls/Cover/CoverView/CoverView.cs
+1
View File
@@ -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;
}
HandyControl/Themes/Styles/Base/CoverViewBaseStyle.xaml
+1 -1
View File
@@ -38,7 +38,7 @@
</TransformGroup>
</Border.RenderTransform>
</Border>
<Border x:Name="PART_Content" Height="0" Grid.Row="1" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
<Border x:Name="PART_Content" MinHeight="30" Height="0" Grid.Row="1" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
<ContentPresenter Margin="{TemplateBinding Padding}"/>
</Border>
<Rectangle SnapsToDevicePixels="True" Visibility="{Binding Visibility,ElementName=PART_Triangle}" Grid.Row="1" VerticalAlignment="Top" HorizontalAlignment="Left" Width="28" Margin="{Binding Margin,ElementName=PART_Triangle}" Height="1" Fill="{TemplateBinding Background}">
HandyControlDemo/ViewModel/Basic/ChatBoxViewModel.cs
+4 -5
View File
@@ -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);
Net40/HandyControlDemo_Net40/ViewModel/Basic/ChatBoxViewModel.cs
+4 -4
View File
@@ -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);
Net40/HandyControl_Net40/Controls/Cover/CoverView/CoverView.cs
+1
View File
@@ -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;
}
Net40/HandyControl_Net40/Themes/Styles/Base/CoverViewBaseStyle.xaml
+1 -1
View File
@@ -38,7 +38,7 @@
</TransformGroup>
</Border.RenderTransform>
</Border>
<Border x:Name="PART_Content" Height="0" Grid.Row="1" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
<Border x:Name="PART_Content" MinHeight="30" Height="0" Grid.Row="1" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
<ContentPresenter Margin="{TemplateBinding Padding}"/>
</Border>
<Rectangle SnapsToDevicePixels="True" Visibility="{Binding Visibility,ElementName=PART_Triangle}" Grid.Row="1" VerticalAlignment="Top" HorizontalAlignment="Left" Width="28" Margin="{Binding Margin,ElementName=PART_Triangle}" Height="1" Fill="{TemplateBinding Background}">