控件重名冲突

This commit is contained in:
艾竹
2023-04-18 22:38:20 +08:00
parent 033bebb6bc
commit 451df2d5de
16 changed files with 20 additions and 86 deletions

View File

@@ -36,7 +36,7 @@
<Setter Property="ToolBox">
<Setter.Value>
<ControlTemplate TargetType="Control">
<controls:ToolBoxControl />
<controls:FlowchartToolBoxControl />
</ControlTemplate>
</Setter.Value>
</Setter>

View File

@@ -1,4 +1,4 @@
<UserControl x:Class="AIStudio.Wpf.Flowchart.Controls.ToolBoxControl"
<UserControl x:Class="AIStudio.Wpf.Flowchart.Controls.FlowchartToolBoxControl"
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"

View File

@@ -16,14 +16,14 @@ using AIStudio.Wpf.Flowchart.ViewModels;
namespace AIStudio.Wpf.Flowchart.Controls
{
/// <summary>
/// Interaction logic for ToolBoxControl.xaml
/// Interaction logic for FlowchartToolBoxControl.xaml
/// </summary>
public partial class ToolBoxControl : UserControl
public partial class FlowchartToolBoxControl : UserControl
{
public ToolBoxControl()
public FlowchartToolBoxControl()
{
InitializeComponent();
this.DataContext = new ToolBoxViewModel();
this.DataContext = new FlowchartToolBoxViewModel();
}
}
}