Skip to content

Change color on mouse move on the second picker #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Change color on mouse move on the second picker #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dac649a
Change color on mouse move on the second picker
halachkin Jun 29, 2018
b39b18b
inital color + second picker fix
halachkin May 8, 2020
feaa15c
picker2 hue value synchronization
halachkin Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/ColorPickerWPF/ColorPickRow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ public ColorPickRow()
private void PickColorButton_OnClick(object sender, RoutedEventArgs e)
{
Color color;
if (ColorPickerWindow.ShowDialog(out color, Options))
Color? initialColor = null;
if(ColorDisplayGrid.Background is SolidColorBrush scb)
{
initialColor = scb.Color;
}
if (ColorPickerWindow.ShowDialog(out color, Options, initialColor:initialColor))
{
SetColor(color);
OnPick?.Invoke(this, EventArgs.Empty);
Expand Down
2 changes: 1 addition & 1 deletion src/ColorPickerWPF/ColorPickerControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
MouseDown="SampleImage_OnMouseDown"/>
</Grid>
</TabItem>
<TabItem Header="Picker 2">
<TabItem Header="Picker 2" Selector.Selected="OnPicker2Selected" >
<Grid>
<Image x:Name="SampleImage2" Source="pack://application:,,,/ColorPickerWPF;component/Resources/colorpicker2.png" HorizontalAlignment="Left" Margin="2" VerticalAlignment="Top"
Width="254" Height="254"
Expand Down
31 changes: 26 additions & 5 deletions src/ColorPickerWPF/ColorPickerControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,14 @@ private void SampleImage_OnMouseDown(object sender, MouseButtonEventArgs e)
this.MouseUp += ColorPickerControl_MouseUp;
}

private void SampleImage2_OnMouseDown(object sender, MouseButtonEventArgs e)
{
Mouse.Capture(this);

this.MouseMove += ColorPickerControl2_MouseMove;
this.MouseUp += ColorPickerControl2_MouseUp;
}


private void ColorPickerControl_MouseMove(object sender, MouseEventArgs e)
{
Expand All @@ -194,18 +202,26 @@ private void ColorPickerControl_MouseMove(object sender, MouseEventArgs e)
SampleImageClick(img, pos);
}

private void ColorPickerControl2_MouseMove(object sender, MouseEventArgs e)
{
var pos = e.GetPosition(SampleImage2);
var img = SampleImage2.Source as BitmapSource;

if (pos.X > 0 && pos.Y > 0 && pos.X < img.PixelWidth && pos.Y < img.PixelHeight)
SampleImageClick(img, pos);
}

private void ColorPickerControl_MouseUp(object sender, MouseButtonEventArgs e)
{
Mouse.Capture(null);
this.MouseMove -= ColorPickerControl_MouseMove;
this.MouseUp -= ColorPickerControl_MouseUp;
}

private void SampleImage2_OnMouseDown(object sender, MouseButtonEventArgs e)
private void ColorPickerControl2_MouseUp(object sender, MouseButtonEventArgs e)
{
var pos = e.GetPosition(SampleImage2);
var img = SampleImage2.Source as BitmapSource;
SampleImageClick(img, pos);
Mouse.Capture(null);
this.MouseMove -= ColorPickerControl2_MouseMove;
this.MouseUp -= ColorPickerControl2_MouseUp;
}

private void Swatch_OnOnPickColor(Color color)
Expand Down Expand Up @@ -339,6 +355,11 @@ private void UpdateImageForHSV()
SampleImage2.Source = writableImage;
}

private void OnPicker2Selected(object sender, RoutedEventArgs e)
{
PickerHueSlider.Value = Color.GetHue();
}

private void LSlider_OnOnValueChanged(double value)
{
if (!IsSettingValues)
Expand Down
6 changes: 5 additions & 1 deletion src/ColorPickerWPF/ColorPickerWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,18 @@ public ColorPickerWindow()
InitializeComponent();
}

public static bool ShowDialog(out Color color, ColorPickerDialogOptions flags = ColorPickerDialogOptions.None, ColorPickerControl.ColorPickerChangeHandler customPreviewEventHandler = null)
public static bool ShowDialog(out Color color, ColorPickerDialogOptions flags = ColorPickerDialogOptions.None, ColorPickerControl.ColorPickerChangeHandler customPreviewEventHandler = null, Color? initialColor=null)
{
if ((flags & ColorPickerDialogOptions.LoadCustomPalette) == ColorPickerDialogOptions.LoadCustomPalette)
{
ColorPickerSettings.UsingCustomPalette = true;
}

var instance = new ColorPickerWindow();
if(initialColor.HasValue)
{
instance.ColorPicker.SetColor(initialColor.Value);
}
color = instance.ColorPicker.Color;

if ((flags & ColorPickerDialogOptions.SimpleView) == ColorPickerDialogOptions.SimpleView)
Expand Down