清理ColorPicker,进度条。修复UI问题
This commit is contained in:
@@ -8,8 +8,8 @@
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:mep="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
|
||||
xmlns:rvMep="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
|
||||
xmlns:ui="https://github.com/ShrlAlgo/Melskin"
|
||||
xmlns:rvView="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvView"
|
||||
xmlns:ui="https://github.com/ShrlAlgo/Melskin"
|
||||
Title="系统设置"
|
||||
Width="550"
|
||||
Height="450"
|
||||
@@ -75,19 +75,26 @@
|
||||
</DataGridTemplateColumn.CellStyle>-->
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<Border>
|
||||
<!--<Border>
|
||||
<Button
|
||||
Command="{Binding DataContext.OpenColorPickerCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}}}"
|
||||
CommandParameter="{Binding}"
|
||||
Content="编辑" />
|
||||
</Border>
|
||||
|
||||
</Border>-->
|
||||
<ui:ColorPicker SelectedColor="{Binding FillColor, Converter={x:Static converters:Rv2WinColorConverter.Instance}, UpdateSourceTrigger=PropertyChanged}" />
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<DataGridTextColumn />
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<Button
|
||||
Grid.Row="2"
|
||||
Margin="5"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Bottom"
|
||||
Command="{Binding SaveCommand}"
|
||||
Content="保存" />
|
||||
<!--<StackPanel Grid.Row="2" Orientation="Horizontal">
|
||||
-->
|
||||
<!--<colorpicker:StandardColorPicker x:Name="main" Style="{StaticResource DefaultColorPickerStyle}" />
|
||||
|
||||
Reference in New Issue
Block a user