From 74c16f96cb140b58c3944bb4be8db9be2475af6c Mon Sep 17 00:00:00 2001
From: Tongg <tongguibina@163.com>
Date: Fri, 10 Jan 2025 16:30:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=9A=E8=AF=AD=E8=A8=80MessageBox?=
=?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B0=83=E6=95=B4=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Language/en_US.xaml | 2 +-
Model/Helper/MultilingualHelper.cs | 13 ++++++++++++-
Views/Dialog/MessageBox.xaml | 6 +++---
Views/Dialog/MessageBox.xaml.cs | 12 ++++++++++++
4 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/Language/en_US.xaml b/Language/en_US.xaml
index df45989..f04442b 100644
--- a/Language/en_US.xaml
+++ b/Language/en_US.xaml
@@ -149,7 +149,7 @@
<sys:String x:Key="ViewportSelectPath">Select Path</sys:String>
<!-- Login Page -->
- <sys:String x:Key="LoginWindowTitle">Starshine Diamond Detection System</sys:String>
+ <sys:String x:Key="LoginWindowTitle">Spark Diamond Detection System</sys:String>
<sys:String x:Key="LoginWindowAccount">Account</sys:String>
<sys:String x:Key="LoginWindowPassword">Password</sys:String>
<sys:String x:Key="LoginWindowRemember">Remember Password</sys:String>
diff --git a/Model/Helper/MultilingualHelper.cs b/Model/Helper/MultilingualHelper.cs
index d785119..bc33184 100644
--- a/Model/Helper/MultilingualHelper.cs
+++ b/Model/Helper/MultilingualHelper.cs
@@ -15,7 +15,7 @@ public class MultilingualHelper
/// <returns>文字</returns>
/// <exception cref="NullReferenceException"></exception>
public static string getString(string key)
- {
+ {
var result = Application.Current.TryFindResource(key);
if (result == null)
{
@@ -23,6 +23,17 @@ public class MultilingualHelper
}
return (string)result;
}
+
+ /// <summary>
+ /// 获取多语言字符
+ /// </summary>
+ /// <param name="key">KEY</param>
+ /// <returns>文字</returns>
+ /// <exception cref="NullReferenceException"></exception>
+ public static string getLangType()
+ {
+ return ConfigHelper.Instance.Lang.ToString();
+ }
/// <summary>
/// 设置语言
diff --git a/Views/Dialog/MessageBox.xaml b/Views/Dialog/MessageBox.xaml
index d2a6179..66a2815 100644
--- a/Views/Dialog/MessageBox.xaml
+++ b/Views/Dialog/MessageBox.xaml
@@ -37,7 +37,7 @@
<Image Style="{StaticResource CloseHoverImageStyle}" Width="30" Height="30" />
</Button>
- <TextBlock Grid.Row="1" Width="600" TextWrapping = "Wrap" Padding="30 0" HorizontalAlignment="Center"
+ <TextBlock Grid.Row="1" Width="600" TextWrapping = "Wrap" Padding="30 0" HorizontalAlignment="Center" SizeChanged="TextBlockCenterBox_OnSizeChanged"
VerticalAlignment="Center" TextAlignment="Center" FontSize="18" x:Name="TextBlockCenterBox" Margin="0 20"
/>
<Border Grid.Row="2" Width="500" Height="40" CornerRadius="20" BorderBrush="#ebeef5"
@@ -56,7 +56,7 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
- <Button x:Name="ConfirmButton" Grid.Column="1" Padding="0" Margin="0" Height="50" Click="ConfirmButton_OnClick"
+ <Button x:Name="ConfirmButton" Grid.Column="1" Padding="0" Margin="0 0 0 20" Height="50" Click="ConfirmButton_OnClick"
BorderThickness="0" Background="Transparent" FocusVisualStyle="{x:Null}">
<Border
HorizontalAlignment="Center"
@@ -75,7 +75,7 @@
<TextBlock FontSize="18" x:Name="ConfirmButtonText" TextAlignment="Center" Foreground="#ffffff"></TextBlock>
</Border>
</Button>
- <Button x:Name="CancelButton" Grid.Column="3" Padding="0" Margin="0" Height="50" Click="CancelButton_OnClick"
+ <Button x:Name="CancelButton" Grid.Column="3" Padding="0" Margin="0 0 0 20" Height="50" Click="CancelButton_OnClick"
BorderThickness="0" Background="Transparent" FocusVisualStyle="{x:Null}">
<Border
HorizontalAlignment="Center"
diff --git a/Views/Dialog/MessageBox.xaml.cs b/Views/Dialog/MessageBox.xaml.cs
index c9b2b81..6ad6bf1 100644
--- a/Views/Dialog/MessageBox.xaml.cs
+++ b/Views/Dialog/MessageBox.xaml.cs
@@ -124,4 +124,16 @@ public partial class MessageBox : Window
_result = MessageBoxResult.Cancel;
this.Close();
}
+
+ private void TextBlockCenterBox_OnSizeChanged(object sender, SizeChangedEventArgs e)
+ {
+ double singleLineHeight = TextBlockCenterBox.FontSize * 1.4;
+
+ if (TextBlockCenterBox.ActualHeight > singleLineHeight)
+ {
+ // 发生换行
+ this.Height += 40;
+ }
+
+ }
}
\ No newline at end of file