From 9211ec11c112e18cd99e77f889a01110a70031ce Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 24 十一月 2025 17:47:15 +0800
Subject: [PATCH] 优化项目结构
---
HMI.UI/Style/MsgBoxStyle.xaml | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/HMI.UI/Style/MsgBoxStyle.xaml b/HMI.UI/Style/MsgBoxStyle.xaml
index f782ed6..9bc748d 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="Width" Value="350" />
+ <Setter Property="Height" Value="200" />
+ <Setter Property="SizeToContent" Value="Manual" />
</Style>
</pu:MessageBoxXSettings.WindowXStyle>
@@ -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="Width" Value="350" />
+ <Setter Property="Height" Value="200" />
+ <Setter Property="SizeToContent" Value="Manual" />
</Style>
</pu:MessageBoxXSettings.WindowXStyle>
@@ -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="Width" Value="350" />
+ <Setter Property="Height" Value="200" />
+ <Setter Property="SizeToContent" Value="Manual" />
</Style>
</pu:MessageBoxXSettings.WindowXStyle>
@@ -112,22 +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="FontSize" Value="18" />
<Setter Property="Background" Value="{StaticResource SuccessColor}" />
<Setter Property="Foreground" Value="{StaticResource 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="FontSize" Value="18" />
<Setter Property="Background" Value="{StaticResource WarningColor}" />
<Setter Property="Foreground" Value="{StaticResource SuccessColorContrast}" />
</Style>
- </pu:ToastSettings.LabelStyle>
- </pu:ToastSettings>
+ </pu:ToastSetting.LabelStyle>
+ </pu:ToastSetting>
+ <pu:ToastSetting x:Key="toastError" Spacing="25">
+ <pu:ToastSetting.LabelStyle>
+ <Style TargetType="Label" BasedOn="{StaticResource {x:Static pu:Toast.LabelStyleKey}}">
+ <Setter Property="FontSize" Value="18" />
+ <Setter Property="Background" Value="{StaticResource DangerColor}" />
+ <Setter Property="Foreground" Value="{StaticResource DangerColorContrast}" />
+ </Style>
+ </pu:ToastSetting.LabelStyle>
+ </pu:ToastSetting>
</ResourceDictionary>
\ No newline at end of file
--
Gitblit v1.9.1