Update SettingsWindow2.xaml
This commit is contained in:
@@ -389,6 +389,9 @@ namespace Ink_Canvas.Helpers
|
|||||||
Application.Current?.Dispatcher?.BeginInvoke(new Action(() =>
|
Application.Current?.Dispatcher?.BeginInvoke(new Action(() =>
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
{
|
||||||
|
// 再次检查PPTApplication是否为null,因为可能在异步操作期间被修改
|
||||||
|
if (PPTApplication != null && Marshal.IsComObject(PPTApplication))
|
||||||
{
|
{
|
||||||
PPTApplication.PresentationOpen -= OnPresentationOpen;
|
PPTApplication.PresentationOpen -= OnPresentationOpen;
|
||||||
PPTApplication.PresentationClose -= OnPresentationClose;
|
PPTApplication.PresentationClose -= OnPresentationClose;
|
||||||
@@ -396,6 +399,7 @@ namespace Ink_Canvas.Helpers
|
|||||||
PPTApplication.SlideShowNextSlide -= OnSlideShowNextSlide;
|
PPTApplication.SlideShowNextSlide -= OnSlideShowNextSlide;
|
||||||
PPTApplication.SlideShowEnd -= OnSlideShowEnd;
|
PPTApplication.SlideShowEnd -= OnSlideShowEnd;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
catch (COMException comEx)
|
catch (COMException comEx)
|
||||||
{
|
{
|
||||||
var hr = (uint)comEx.HResult;
|
var hr = (uint)comEx.HResult;
|
||||||
|
|||||||
@@ -22,6 +22,11 @@
|
|||||||
<ResourceDictionary.MergedDictionaries>
|
<ResourceDictionary.MergedDictionaries>
|
||||||
<ui:ThemeResources />
|
<ui:ThemeResources />
|
||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
<!-- L-Pattern Overwriting resources -->
|
||||||
|
<Thickness x:Key="NavigationViewContentMargin">0,48,0,0</Thickness>
|
||||||
|
<Thickness x:Key="NavigationViewContentGridBorderThickness">1,1,0,0</Thickness>
|
||||||
|
<CornerRadius x:Key="NavigationViewContentGridCornerRadius">8,0,0,0</CornerRadius>
|
||||||
|
<Thickness x:Key="NavigationViewHeaderMargin">56,34,0,0</Thickness>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user