From 9d1660270272180cd71147d6ddd53d1382643d2e Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 02 十一月 2026 18:00:14 +0800
Subject: [PATCH] merge: 并入远程 Initial commit 作为历史根节点
---
HMI.UI/MaskControl.xaml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HMI.UI/MaskControl.xaml b/HMI.UI/MaskControl.xaml
index 4c7fb02..4f603ef 100644
--- a/HMI.UI/MaskControl.xaml
+++ b/HMI.UI/MaskControl.xaml
@@ -19,16 +19,16 @@
<Grid.ColumnDefinitions>
<ColumnDefinition />
</Grid.ColumnDefinitions>
- <Border Padding="10,5,0,5" Background="{StaticResource PrimaryColor}"
+ <Border Padding="10,5,0,5" Background="{DynamicResource PrimaryColor}"
CornerRadius="5,5,0,0">
- <Label Padding="2" Margin="0" Foreground="#FFF" x:Name="titleLabel" Content="璇风◢鍚�"/>
+ <Label Padding="2" Background="Transparent" BorderThickness="0" Margin="0" Foreground="#FFF" x:Name="titleLabel" Content="璇风◢鍚�"/>
</Border>
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="20">
<TextBlock FontSize="45"
- FontFamily="{StaticResource iconfont}" Foreground="{StaticResource PrimaryColor}"
+ FontFamily="{StaticResource iconfont}" Foreground="{DynamicResource PrimaryColor}"
RenderTransformOrigin="0.5,0.5"
VerticalAlignment="Center" Text="">
<TextBlock.RenderTransform>
@@ -48,7 +48,7 @@
</EventTrigger>
</TextBlock.Triggers>
</TextBlock>
- <TextBlock Grid.Row="1" Margin="20,0,0,0" Grid.Column="1" x:Name="contentLabel"
+ <TextBlock Grid.Row="1" Margin="20,0,0,0" Grid.Column="1" Background="Transparent" x:Name="contentLabel"
VerticalAlignment="Center" TextWrapping="Wrap"/>
</StackPanel>
</Grid>
--
Gitblit v1.9.1