整理代码

ShrlAlgoToolkit.RevitAddins/Windows/ColorPickerWin.xaml

@@ -1,18 +1,19 @@
 <ui:NeoWindow
-    Height="390"
-    Title="颜色设置"
-    Width="340"
-    WindowStartupLocation="CenterOwner"
-    d:DataContext="{d:DesignInstance Type=local2:ColorPickerViewModel}"
-    mc:Ignorable="d"
     x:Class="ShrlAlgoToolkit.RevitAddins.Windows.ColorPickerWin"
     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:local2="clr-namespace:ShrlAlgoToolkit.RevitAddins.Windows"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="颜色设置"
+    Width="340"
+    Height="390"
+    d:DataContext="{d:DesignInstance Type=local2:ColorPickerViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    WindowStartupLocation="CenterOwner"
+    mc:Ignorable="d">
     <Window.Resources>
         <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
     </Window.Resources>
@@ -35,16 +36,16 @@
                 </b:EventTrigger>
             </b:Interaction.Triggers>
         </controls:StandardColorPicker>-->
-        <ui:ColorPicker
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
+        <ui:ColorPanel
+            x:Name="ColorPicker"
             Grid.Row="0"
-            SelectedColor="{Binding SelectedColor}"
-            x:Name="ColorPicker" />
-        <StackPanel
             Grid.Column="0"
             Grid.ColumnSpan="2"
+            SelectedColor="{Binding SelectedColor}" />
+        <StackPanel
             Grid.Row="1"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
             HorizontalAlignment="Center"
             Orientation="Horizontal">
             <Button