From 21e28b068c8d0763a6d4ab613388a77a0db157fb Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 03 三月 2025 19:01:30 +0800
Subject: [PATCH] 优化结构；
---
HMI.SettingControl/SettingControl.xaml | 54 ++++++++++++++++++++----------------------------------
1 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/HMI.SettingControl/SettingControl.xaml b/HMI.SettingControl/SettingControl.xaml
index 3116895..8a2e249 100644
--- a/HMI.SettingControl/SettingControl.xaml
+++ b/HMI.SettingControl/SettingControl.xaml
@@ -9,7 +9,7 @@
xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
xmlns:pw="https://opensource.panuon.com/wpf"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
- xmlns:dp="clr-namespace:HMI.UI;assembly=HMI.UI"
+ xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
Loaded="UserControl_Loaded"
Background="{StaticResource WorkspaceBackground}"
d:DesignHeight="450" d:DesignWidth="800">
@@ -28,49 +28,35 @@
<Grid>
<Border Style="{StaticResource CardBoarder}">
- <Grid>
+ <Grid dp:GridHelper.Space="10">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition />
+ <RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
- <TextBlock VerticalAlignment="Center" Text="绯荤粺璁剧疆" Margin="0,0,0,10"
- FontSize="{StaticResource TitleFontSize}" />
- <TabControl Grid.Row="1"
-pu:TabControlHelper.HeaderPanelAlignment="Front"
-pu:TabControlHelper.ItemsBackground="{StaticResource PrimaryColorContract}"
-pu:TabControlHelper.ItemsForeground="{StaticResource PrimaryColor}"
-
-pu:TabControlHelper.ItemsHeight="40"
-pu:TabControlHelper.ItemsHorizontalHeaderAlignment="Left"
-pu:TabControlHelper.ItemsHoverBackground="{StaticResource SecondPrimaryColor}"
-pu:TabControlHelper.ItemsHoverForeground="{StaticResource SecondPrimaryColorContract}"
-pu:TabControlHelper.ItemsRibbonLineMargin="0,5,0,5"
-pu:TabControlHelper.ItemsRibbonLineThickness="4"
-pu:TabControlHelper.ItemsRibbonLineVisibility="Visible"
-pu:TabControlHelper.ItemsSelectedBackground="{StaticResource PrimaryColor}"
-pu:TabControlHelper.ItemsSelectedForeground="{StaticResource PrimaryColorContract}"
-pu:TabControlHelper.ItemsSelectedRibbonLineBrush="#FFFFFF"
-pu:TabControlHelper.ItemsSelectedRibbonLineThickness="2"
-TabStripPlacement="Left"
- BorderThickness="0"
+ <TextBlock VerticalAlignment="Center" Text="绯荤粺璁剧疆" FontSize="{StaticResource TitleFontSize}" />
+ <TabControl Grid.Row="1" x:Name="tabControl"
BorderBrush="{StaticResource CommonBoarder}"
ItemsSource="{Binding TabItems}">
- <TabControl.Resources>
- <Style TargetType="TabControl" BasedOn="{StaticResource {x:Static pu:StyleKeys.TabControlStyle}}">
- <Setter Property="Template">
- <Setter.Value>
- <ControlTemplate TargetType="TabControl">
- <Border BorderBrush="Black" BorderThickness="1">
+ <TabControl.Resources>
+ <Style TargetType="TabControl" BasedOn="{StaticResource {x:Static pu:StyleKeys.TabControlStyle}}">
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="TabControl">
+ <Border BorderBrush="Black" BorderThickness="1">
<ContentPresenter/>
</Border>
- </ControlTemplate>
- </Setter.Value>
- </Setter>
- </Style>
- </TabControl.Resources>
-
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+ </TabControl.Resources>
</TabControl>
+ <StackPanel Grid.Row="2" Style="{StaticResource ButtonGroup}">
+ <Button Style="{StaticResource PrimaryButton}" x:Name="resetBtn" Click="Button_Click">閲嶇疆</Button>
+ <Button Style="{StaticResource PrimaryButton}" x:Name="saveBtn" Click="Button_Click">淇濆瓨</Button>
+ </StackPanel>
</Grid>
</Border>
</Grid>
--
Gitblit v1.9.1