整理代码

ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveView.xaml

@@ -1,13 +1,7 @@
 <ui:NeoWindow
-    Height="450"
-    MinHeight="480"
-    MinWidth="320"
-    Title="避让处理"
-    Width="320"
-    d:DataContext="{d:DesignInstance Type=local:ClashResolveViewModel}"
-    mc:Ignorable="d"
     x:Class="ShrlAlgoToolkit.RevitAddins.RvMEP.ClashResolveView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
@@ -15,7 +9,14 @@
     xmlns:rvMep="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="避让处理"
+    Width="320"
+    Height="450"
+    MinWidth="320"
+    MinHeight="480"
+    d:DataContext="{d:DesignInstance Type=local:ClashResolveViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
     <b:Interaction.Triggers>
         <b:EventTrigger EventName="Closing">
             <b:InvokeCommandAction Command="{Binding ClosingCommand}" />
@@ -82,12 +83,12 @@
                         </Binding>
                     </RadioButton.IsChecked>
                 </RadioButton>
-                <RadioButton Content="自定义" x:Name="LbCustom" />
+                <RadioButton x:Name="LbCustom" Content="自定义" />
                 <TextBox IsEnabled="{Binding IsChecked, ElementName=LbCustom}" Text="{Binding Angle, UpdateSourceTrigger=PropertyChanged}" />
             </UniformGrid>
         </GroupBox>
         <ui:StackPanel Orientation="Horizontal" Spacing="5">
-            <GroupBox Header="参考方式" ui:StackPanel.Fill="Fill">
+            <GroupBox ui:StackPanel.Fill="Fill" Header="参考方式">
                 <UniformGrid Rows="1">
                     <RadioButton
                         Content="手动"
@@ -99,7 +100,7 @@
                         ToolTip="选择相交的两条管线，将翻弯管线偏移一定距离" />
                 </UniformGrid>
             </GroupBox>
-            <GroupBox Header="调整方式" ui:StackPanel.Fill="Fill">
+            <GroupBox ui:StackPanel.Fill="Fill" Header="调整方式">
                 <UniformGrid Rows="1">
                     <RadioButton Content="单侧" IsChecked="{Binding AdjustType, ConverterParameter={x:Static rvMep:AdjustType.OneSide}, Converter={StaticResource ComparisonConverter}}" />
                     <RadioButton Content="双侧" IsChecked="{Binding AdjustType, ConverterParameter={x:Static rvMep:AdjustType.TwoSide}, Converter={StaticResource ComparisonConverter}}" />
@@ -117,12 +118,12 @@
         <TextBox
             ui:InputAssist.Prefix="偏移量:"
             ui:InputAssist.Suffix="mm"
-            Text="{Binding Offset, UpdateSourceTrigger=PropertyChanged}"
-            ui:StackPanel.Fill="Fill" />
+            ui:StackPanel.Fill="Fill"
+            Text="{Binding Offset, UpdateSourceTrigger=PropertyChanged}" />
         <Button
-            Command="{Binding ResolveCommand}"
-            Content="调整"
             HorizontalAlignment="Stretch"
-            ui:StackPanel.Fill="Fill" />
+            ui:StackPanel.Fill="Fill"
+            Command="{Binding ResolveCommand}"
+            Content="调整" />
     </ui:StackPanel>
 </ui:NeoWindow>