From a3ba25607612818c28d421bfa8eb2f92339d71ac Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 13 三月 2025 20:30:48 +0800
Subject: [PATCH] 优化项目；
---
WPFProject/UI/WorkControl.xaml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/WPFProject/UI/WorkControl.xaml b/WPFProject/UI/WorkControl.xaml
index e549395..84bb897 100644
--- a/WPFProject/UI/WorkControl.xaml
+++ b/WPFProject/UI/WorkControl.xaml
@@ -1,9 +1,10 @@
-锘�<UserControl x:Class="WPFProject.UI.WorkControl"
+锘�<hb:PluginControl x:Class="WPFProject.UI.WorkControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:WPFProject.UI"
+ xmlns:hb="clr-namespace:HMI.Base;assembly=HMI.Base"
+ xmlns:ui="clr-namespace:WPFProject.UI"
xmlns:vm="clr-namespace:WPFProject.ViewModels"
xmlns:view="clr-namespace:WPFProject.UI"
xmlns:utils="clr-namespace:WPFProject.Utils"
@@ -13,18 +14,18 @@
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
- <ResourceDictionary Source="/WPFProject;component/Style/colors.xaml"/>
+ <ResourceDictionary Source="/HMI.UI;component/Style/Colors.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<Grid>
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
- <Canvas x:Name="WorkArea" Background="{StaticResource MainMenu}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+ <Canvas x:Name="WorkArea" Background="#FFF" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<!--<vt:ProgramList BorderThickness="1" BorderBrush="#000" Canvas.Left="335" Canvas.Top="121" utils:Resize.IsResizeable="True"></vt:ProgramList>
<vt:ProgramList BorderThickness="1" BorderBrush="#000" Canvas.Left="600" Canvas.Top="121" FocusableChanged="ProgramList_FocusableChanged"></vt:ProgramList>-->
- <local:BottomBar x:Name="BottomBar" Canvas.Bottom="0" Panel.ZIndex="9999999"/>
+ <ui:BottomBar x:Name="BottomBar" Canvas.Bottom="0" Panel.ZIndex="9999999"/>
</Canvas>
</ScrollViewer>
@@ -66,4 +67,4 @@
<vt:ProgramList Grid.Row="2" BorderThickness="1" BorderBrush="#000"></vt:ProgramList>
</Grid>-->
</Grid>
-</UserControl>
+</hb:PluginControl>
--
Gitblit v1.9.1