Merge branch 'master' into patch-1

This commit is contained in:
NaBian authored and GitHub committed 2020-11-27 22:00:48 +08:00
commit 1be2278799
4 files changed
+25 -3

No files matched your search

@@ -485,8 +485,19 @@ namespace HandyControl.Controls
growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush; growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush;
growlInfo.StaysOpen = true; growlInfo.StaysOpen = true;
growlInfo.ShowCloseButton = false; growlInfo.ShowCloseButton = false;
Application.Current.Dispatcher?.Invoke(
#if NET40
new Action(
#endif
() =>
{
if (GrowlPanel.ContextMenu != null) GrowlPanel.ContextMenu.Opacity = 0; if (GrowlPanel.ContextMenu != null) GrowlPanel.ContextMenu.Opacity = 0;
} }
#if NET40
)
#endif
);
}
else else
{ {
growlInfo.IconKey ??= ResourceToken.FatalGeometry; growlInfo.IconKey ??= ResourceToken.FatalGeometry;
@@ -10,7 +10,7 @@
<!--region Button--> <!--region Button-->
<Style BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button"> <Style x:Key="ButtonDefault" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/> <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
<Style.Triggers> <Style.Triggers>
@@ -23,6 +23,8 @@
</Style.Triggers> </Style.Triggers>
</Style> </Style>
<Style BasedOn="{StaticResource ButtonDefault}" TargetType="Button"/>
<Style x:Key="ButtonPrimary" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button"> <Style x:Key="ButtonPrimary" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
<Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/> <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
</Style> </Style>
@@ -10,7 +10,7 @@
<!--region RepeatButton--> <!--region RepeatButton-->
<Style BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton"> <Style x:Key="RepeatButtonDefault" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/> <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
<Style.Triggers> <Style.Triggers>
@@ -22,18 +22,25 @@
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
<Style BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton"/>
<Style x:Key="RepeatButtonPrimary" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton"> <Style x:Key="RepeatButtonPrimary" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
<Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/> <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
</Style> </Style>
<Style x:Key="RepeatButtonSuccess" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton"> <Style x:Key="RepeatButtonSuccess" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
<Setter Property="Background" Value="{DynamicResource SuccessBrush}"/> <Setter Property="Background" Value="{DynamicResource SuccessBrush}"/>
</Style> </Style>
<Style x:Key="RepeatButtonInfo" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton"> <Style x:Key="RepeatButtonInfo" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
<Setter Property="Background" Value="{DynamicResource InfoBrush}"/> <Setter Property="Background" Value="{DynamicResource InfoBrush}"/>
</Style> </Style>
<Style x:Key="RepeatButtonWarning" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton"> <Style x:Key="RepeatButtonWarning" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
<Setter Property="Background" Value="{DynamicResource WarningBrush}"/> <Setter Property="Background" Value="{DynamicResource WarningBrush}"/>
</Style> </Style>
<Style x:Key="RepeatButtonDanger" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton"> <Style x:Key="RepeatButtonDanger" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
<Setter Property="Background" Value="{DynamicResource DangerBrush}"/> <Setter Property="Background" Value="{DynamicResource DangerBrush}"/>
</Style> </Style>
@@ -9,7 +9,7 @@
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<!--普通--> <!--普通-->
<Style BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton"> <Style x:Key="ToggleButtonDefault" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
<Setter Property="Background" Value="{DynamicResource RegionBrush}"/> <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/> <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
@@ -23,6 +23,8 @@
</Style.Triggers> </Style.Triggers>
</Style> </Style>
<Style BasedOn="{StaticResource ToggleButtonDefault}" TargetType="ToggleButton"/>
<Style x:Key="ToggleButtonPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton"> <Style x:Key="ToggleButtonPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
<Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/> <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
</Style> </Style>