From dedcf4174c8540ee3a912daad2ff13e014e495b1 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 28 三月 2025 16:28:30 +0800
Subject: [PATCH] 优化UI组件；
---
HMI.UI/Style/PanuonResource.xaml | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/HMI.UI/Style/PanuonResource.xaml b/HMI.UI/Style/PanuonResource.xaml
index 42c9a94..0b103f5 100644
--- a/HMI.UI/Style/PanuonResource.xaml
+++ b/HMI.UI/Style/PanuonResource.xaml
@@ -8,7 +8,6 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:pw="https://opensource.panuon.com/wpf"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
- xmlns:hc="clr-namespace:HMI.Core;assembly=HMI.Core"
xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI">
<ResourceDictionary.MergedDictionaries>
@@ -16,8 +15,6 @@
<pu:StyleDictionary Includes="PasswordBox,TextBox,ComboBox,Button,DataGrid,TreeView,Menu" />
<ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
</ResourceDictionary.MergedDictionaries>
-
- <hc:LangConverter x:Key="lc"/>
<sys:Double x:Key="TitleFontSize">20</sys:Double>
<sys:Double x:Key="ContentFontSize">16</sys:Double>
<sys:Double x:Key="ContentFontSize2">14</sys:Double>
@@ -158,7 +155,7 @@
<Style x:Key="CardBoarder" TargetType="Border">
<Setter Property="BorderBrush" Value="{StaticResource CommonBoarder}"/>
<Setter Property="BorderThickness" Value="2"/>
- <Setter Property="Background" Value="#FFF"/>
+ <Setter Property="Background" Value="#f3f9ff"/>
<Setter Property="Margin" Value="10"/>
<Setter Property="Padding" Value="10"/>
</Style>
@@ -175,7 +172,6 @@
<Style x:Key="DefaultDataGrid" TargetType="DataGrid" BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridStyle}}">
<Style.Resources>
-
<Style TargetType="DataGridCell"
BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridCellStyle}}">
<Setter Property="Background" Value="Transparent"/>
@@ -188,13 +184,11 @@
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Padding" Value="5"/>
</Style>-->
-
<Style TargetType="DataGridColumnHeader"
BasedOn="{StaticResource {x:Static pu:StyleKeys.DataGridColumnHeaderStyle}}">
<Setter Property="Padding" Value="10"/>
<Setter Property="BorderThickness" Value="0"/>
</Style>
-
</Style.Resources>
<Setter Property="pu:DataGridHelper.ColumnHeaderPadding" Value="0"/>
<Setter Property="RowHeight" Value="30"/>
@@ -231,7 +225,6 @@
<Setter Property="pu:DataGridHelper.RowSelectedBackground" Value="{StaticResource PrimaryColor}"/>
<Setter Property="pu:DataGridHelper.RowSelectedForeground" Value="White"/>
<Setter Property="pu:DataGridHelper.RowHeaderBorderThickness" Value="10,0,0,0"/>
- <Setter Property="pu:DataGridHelper.RowHeaderBackground" Value="Red"/>
<Setter Property="pu:DataGridHelper.ColumnHeaderBorderThickness" Value="0"/>
<Setter Property="pu:DataGridHelper.ColumnHeaderPadding" Value="0"/>
</Style>
@@ -285,9 +278,16 @@
<Setter Property="pu:WindowXCaption.Buttons" Value="Close"/>
<Setter Property="pu:WindowXModalDialog.Buttons" Value="OKCancel"/>
<Setter Property="pu:WindowXModalDialog.CancelButtonContent"
- Value="{Binding Converter={StaticResource lc},ConverterParameter='App.Cancel'}"/>
+ Value="{DynamicResource App.Cancel}"/>
<Setter Property="pu:WindowXModalDialog.OKButtonContent"
- Value="{Binding Converter={StaticResource lc},ConverterParameter='App.Save'}"/>
+ Value="{DynamicResource App.Save}"/>
<Setter Property="pu:WindowXModalDialog.ButtonPanelMargin" Value="0,30,10,10"/>
</Style>
+
+ <Popup x:Key="testPop" Placement="Relative" StaysOpen="True" Width="1920" Height="1080">
+ <Rectangle x:Name="RectMask"
+ Fill="Red"
+ Opacity="0"
+ Visibility="Visible" />
+ </Popup>
</ResourceDictionary>
\ No newline at end of file
--
Gitblit v1.9.1