Skip to content

Commit 4db1c8a

Browse files
authored
Merge pull request #720 from ghost1372/patch-5
Add Confirmed and SelectedColorChanged events #673
2 parents 5c01043 + b05dbcf commit 4db1c8a

1 file changed

Lines changed: 22 additions & 6 deletions

File tree

src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,20 +178,30 @@ public class ColorPicker : Control, ISingleOpen
178178

179179
#region Public Events
180180

181+
public static readonly RoutedEvent SelectedColorChangedEvent =
182+
EventManager.RegisterRoutedEvent("SelectedColorChanged", RoutingStrategy.Bubble,
183+
typeof(EventHandler<FunctionEventArgs<Color>>), typeof(ColorPicker));
184+
185+
public event EventHandler<FunctionEventArgs<Color>> SelectedColorChanged
186+
{
187+
add => AddHandler(SelectedColorChangedEvent, value);
188+
remove => RemoveHandler(SelectedColorChangedEvent, value);
189+
}
190+
181191
/// <summary>
182192
/// 颜色改变事件
183193
/// </summary>
184-
public static readonly RoutedEvent SelectedColorChangedEvent =
185-
EventManager.RegisterRoutedEvent("SelectedColorChanged", RoutingStrategy.Bubble,
194+
public static readonly RoutedEvent ConfirmedEvent =
195+
EventManager.RegisterRoutedEvent("Confirmed", RoutingStrategy.Bubble,
186196
typeof(EventHandler<FunctionEventArgs<Color>>), typeof(ColorPicker));
187197

188198
/// <summary>
189199
/// 颜色改变事件
190200
/// </summary>
191-
public event EventHandler<FunctionEventArgs<Color>> SelectedColorChanged
201+
public event EventHandler<FunctionEventArgs<Color>> Confirmed
192202
{
193-
add => AddHandler(SelectedColorChangedEvent, value);
194-
remove => RemoveHandler(SelectedColorChangedEvent, value);
203+
add => AddHandler(ConfirmedEvent, value);
204+
remove => RemoveHandler(ConfirmedEvent, value);
195205
}
196206

197207
/// <summary>
@@ -268,6 +278,10 @@ internal int ChannelB
268278
}
269279
ctl.UpdateStatus(v.Color);
270280
ctl.SelectedBrushWithoutOpacity = new SolidColorBrush(Color.FromRgb(v.Color.R, v.Color.G, v.Color.B));
281+
ctl.RaiseEvent(new FunctionEventArgs<Color>(SelectedColorChangedEvent, ctl)
282+
{
283+
Info = v.Color
284+
});
271285
}));
272286

273287
/// <summary>
@@ -684,10 +698,12 @@ private void NumericUpDownRgb_OnValueChanged(object sender, FunctionEventArgs<do
684698
}
685699

686700
private void ButtonConfirm_OnClick(object sender, RoutedEventArgs e)
687-
=> RaiseEvent(new FunctionEventArgs<Color>(SelectedColorChangedEvent, this)
701+
{
702+
RaiseEvent(new FunctionEventArgs<Color>(ConfirmedEvent, this)
688703
{
689704
Info = SelectedBrush.Color
690705
});
706+
}
691707

692708
private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => RaiseEvent(new RoutedEventArgs(CanceledEvent));
693709

0 commit comments

Comments
 (0)