Head material was added
This commit is contained in:
@@ -26,7 +26,11 @@
|
||||
<TextBox Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="10" Text="{Binding Red}"/>
|
||||
|
||||
<Border Grid.Column="3" Grid.RowSpan="3" Margin="10" BorderBrush="Black" BorderThickness="1">
|
||||
<Rectangle Fill="{Binding SelectedColor}"/>
|
||||
<Rectangle>
|
||||
<Rectangle.Fill>
|
||||
<SolidColorBrush Color="{Binding SelectedColor}"/>
|
||||
</Rectangle.Fill>
|
||||
</Rectangle>
|
||||
</Border>
|
||||
|
||||
|
||||
|
||||
@@ -27,8 +27,8 @@ namespace StructureHelper.Windows.ColorPickerWindow
|
||||
set => OnColorItemChanged(value, ref blue);
|
||||
}
|
||||
|
||||
private Brush selectedColor;
|
||||
public Brush SelectedColor
|
||||
private Color selectedColor;
|
||||
public Color SelectedColor
|
||||
{
|
||||
get => selectedColor;
|
||||
set => OnPropertyChanged(value, ref selectedColor);
|
||||
@@ -38,12 +38,12 @@ namespace StructureHelper.Windows.ColorPickerWindow
|
||||
{
|
||||
if (primitive != null)
|
||||
{
|
||||
var solidBrush = (SolidColorBrush)primitive.Brush;
|
||||
Red = solidBrush.Color.R;
|
||||
Green = solidBrush.Color.G;
|
||||
Blue = solidBrush.Color.B;
|
||||
var color = primitive.Color;
|
||||
Red = color.R;
|
||||
Green = color.G;
|
||||
Blue = color.B;
|
||||
|
||||
SetColor = new RelayCommand(o => primitive.Brush = SelectedColor);
|
||||
SetColor = new RelayCommand(o => primitive.Color = SelectedColor);
|
||||
}
|
||||
}
|
||||
private void OnColorItemChanged(int value, ref int colorItem, [CallerMemberName] string propertyName = null)
|
||||
@@ -58,7 +58,7 @@ namespace StructureHelper.Windows.ColorPickerWindow
|
||||
private void UpdateSelectedColor()
|
||||
{
|
||||
var color = Color.FromRgb((byte)Red, (byte)Green, (byte)Blue);
|
||||
SelectedColor = new SolidColorBrush(color);
|
||||
SelectedColor = color;
|
||||
OnPropertyChanged(nameof(SelectedColor));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user