From 12e606635c42ea20f4b7c2bdda5204237a4b4c96 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 02 三月 2026 16:14:49 +0800
Subject: [PATCH] 优化
---
HMI.UI/Style/MsgBoxStyle.xaml | 78 ++++++++++++++++++++++----------------
1 files changed, 45 insertions(+), 33 deletions(-)
diff --git a/HMI.UI/Style/MsgBoxStyle.xaml b/HMI.UI/Style/MsgBoxStyle.xaml
index 35fc189..1f577a1 100644
--- a/HMI.UI/Style/MsgBoxStyle.xaml
+++ b/HMI.UI/Style/MsgBoxStyle.xaml
@@ -5,12 +5,15 @@
xmlns:puconfig="clr-namespace:Panuon.WPF.UI.Configurations;assembly=Panuon.WPF.UI">
<pu:MessageBoxXSettings x:Key="MsgBoxWarn"
- InteropOwnersMask="True"
+ InteropOwnersMask="False"
InverseButtonsSequence="False">
<pu:MessageBoxXSettings.WindowXStyle>
<Style TargetType="pu:WindowX" BasedOn="{StaticResource {x:Static pu:MessageBoxX.WindowXStyleKey}}">
- <Setter Property="pu:WindowXCaption.Background" Value="{StaticResource WarningColor}" />
- <Setter Property="pu:WindowXCaption.Foreground" Value="{StaticResource WarningColorContract}" />
+ <Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource WarningColor}" />
+ <Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource WarningColorContract}" />
+ <Setter Property="Width" Value="350" />
+ <Setter Property="Height" Value="200" />
+ <Setter Property="SizeToContent" Value="Manual" />
</Style>
</pu:MessageBoxXSettings.WindowXStyle>
@@ -19,8 +22,8 @@
<Style.Triggers>
<Trigger Property="Tag" Value="OK">
- <Setter Property="Foreground" Value="{StaticResource WarningColorContract}" />
- <Setter Property="Background" Value="{StaticResource WarningColor}" />
+ <Setter Property="Foreground" Value="{DynamicResource WarningColorContract}" />
+ <Setter Property="Background" Value="{DynamicResource WarningColor}" />
</Trigger>
<Trigger Property="Tag" Value="Cancel">
@@ -41,12 +44,15 @@
</pu:MessageBoxXSettings>
<pu:MessageBoxXSettings x:Key="MsgBoxError"
- InteropOwnersMask="True"
+ InteropOwnersMask="False"
InverseButtonsSequence="False">
<pu:MessageBoxXSettings.WindowXStyle>
<Style TargetType="pu:WindowX" BasedOn="{StaticResource {x:Static pu:MessageBoxX.WindowXStyleKey}}">
- <Setter Property="pu:WindowXCaption.Background" Value="{StaticResource DangerColor}" />
- <Setter Property="pu:WindowXCaption.Foreground" Value="{StaticResource DangerColorContrast}" />
+ <Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource DangerColor}" />
+ <Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource DangerColorContrast}" />
+ <Setter Property="Width" Value="350" />
+ <Setter Property="Height" Value="200" />
+ <Setter Property="SizeToContent" Value="Manual" />
</Style>
</pu:MessageBoxXSettings.WindowXStyle>
@@ -55,8 +61,8 @@
<Style.Triggers>
<Trigger Property="Tag" Value="OK">
- <Setter Property="Foreground" Value="{StaticResource DangerColorContrast}" />
- <Setter Property="Background" Value="{StaticResource DangerColor}" />
+ <Setter Property="Foreground" Value="{DynamicResource DangerColorContrast}" />
+ <Setter Property="Background" Value="{DynamicResource DangerColor}" />
</Trigger>
<Trigger Property="Tag" Value="Cancel">
@@ -77,12 +83,15 @@
</pu:MessageBoxXSettings>
<pu:MessageBoxXSettings x:Key="MsgBoxInfo"
- InteropOwnersMask="True"
+ InteropOwnersMask="False"
InverseButtonsSequence="False">
<pu:MessageBoxXSettings.WindowXStyle>
<Style TargetType="pu:WindowX" BasedOn="{StaticResource {x:Static pu:MessageBoxX.WindowXStyleKey}}">
- <Setter Property="pu:WindowXCaption.Background" Value="{StaticResource PrimaryColor}" />
- <Setter Property="pu:WindowXCaption.Foreground" Value="{StaticResource PrimaryColorContract}" />
+ <Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource PrimaryColor}" />
+ <Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource PrimaryColorContract}" />
+ <Setter Property="Width" Value="350" />
+ <Setter Property="Height" Value="200" />
+ <Setter Property="SizeToContent" Value="Manual" />
</Style>
</pu:MessageBoxXSettings.WindowXStyle>
@@ -91,8 +100,8 @@
<Style.Triggers>
<Trigger Property="Tag" Value="OK">
- <Setter Property="Foreground" Value="{StaticResource PrimaryColorContract}" />
- <Setter Property="Background" Value="{StaticResource PrimaryColor}" />
+ <Setter Property="Foreground" Value="{DynamicResource PrimaryColorContract}" />
+ <Setter Property="Background" Value="{DynamicResource PrimaryColor}" />
</Trigger>
<Trigger Property="Tag" Value="Cancel">
@@ -112,30 +121,33 @@
</pu:MessageBoxXSettings.ButtonStyle>
</pu:MessageBoxXSettings>
- <pu:ToastSettings x:Key="toastSuccess" Spacing="25">
- <pu:ToastSettings.LabelStyle>
+ <pu:ToastSetting x:Key="toastSuccess" Spacing="25">
+ <pu:ToastSetting.LabelStyle>
<Style TargetType="Label" BasedOn="{StaticResource {x:Static pu:Toast.LabelStyleKey}}">
- <Setter Property="Background" Value="{StaticResource SuccessColor}" />
- <Setter Property="Foreground" Value="{StaticResource SuccessColorContrast}" />
+ <Setter Property="FontSize" Value="18" />
+ <Setter Property="Background" Value="{DynamicResource SuccessColor}" />
+ <Setter Property="Foreground" Value="{DynamicResource SuccessColorContrast}" />
</Style>
- </pu:ToastSettings.LabelStyle>
- </pu:ToastSettings>
+ </pu:ToastSetting.LabelStyle>
+ </pu:ToastSetting>
- <pu:ToastSettings x:Key="toastWarning" Spacing="25">
- <pu:ToastSettings.LabelStyle>
+ <pu:ToastSetting x:Key="toastWarning" Spacing="25">
+ <pu:ToastSetting.LabelStyle>
<Style TargetType="Label" BasedOn="{StaticResource {x:Static pu:Toast.LabelStyleKey}}">
- <Setter Property="Background" Value="{StaticResource WarningColor}" />
- <Setter Property="Foreground" Value="{StaticResource SuccessColorContrast}" />
+ <Setter Property="FontSize" Value="18" />
+ <Setter Property="Background" Value="{DynamicResource WarningColor}" />
+ <Setter Property="Foreground" Value="{DynamicResource SuccessColorContrast}" />
</Style>
- </pu:ToastSettings.LabelStyle>
- </pu:ToastSettings>
+ </pu:ToastSetting.LabelStyle>
+ </pu:ToastSetting>
- <pu:ToastSettings x:Key="toastError" Spacing="25">
- <pu:ToastSettings.LabelStyle>
+ <pu:ToastSetting x:Key="toastError" Spacing="25">
+ <pu:ToastSetting.LabelStyle>
<Style TargetType="Label" BasedOn="{StaticResource {x:Static pu:Toast.LabelStyleKey}}">
- <Setter Property="Background" Value="{StaticResource DangerColor}" />
- <Setter Property="Foreground" Value="{StaticResource DangerColorContrast}" />
+ <Setter Property="FontSize" Value="18" />
+ <Setter Property="Background" Value="{DynamicResource DangerColor}" />
+ <Setter Property="Foreground" Value="{DynamicResource DangerColorContrast}" />
</Style>
- </pu:ToastSettings.LabelStyle>
- </pu:ToastSettings>
+ </pu:ToastSetting.LabelStyle>
+ </pu:ToastSetting>
</ResourceDictionary>
\ No newline at end of file
--
Gitblit v1.9.1