refactor: Rename TickUp/DownParameter TickUp/DownCommandParameter
This commit is contained in:
1 parent
a66d3fb28a
commit
2fa9b2e0e5
5 files changed
+66
-66
No files matched your search
+12
-12
@@ -57,29 +57,29 @@
|
||||
<controls:TickUpDown
|
||||
Content="Put Rotation"
|
||||
TickCommand="{Binding put_rotation}"
|
||||
TickUpParameter="true"
|
||||
TickDownParameter="false" />
|
||||
TickUpCommandParameter="true"
|
||||
TickDownCommandParameter="false" />
|
||||
<controls:TickUpDown
|
||||
Content="Call Rotation"
|
||||
TickCommand="{Binding call_rotation}"
|
||||
TickUpParameter="true"
|
||||
TickDownParameter="false" />
|
||||
TickUpCommandParameter="true"
|
||||
TickDownCommandParameter="false" />
|
||||
<controls:TickUpDown
|
||||
Content="Risk Reversal"
|
||||
TickCommand="{Binding full_rotation}"
|
||||
TickUpParameter="true"
|
||||
TickDownParameter="false" />
|
||||
TickUpCommandParameter="true"
|
||||
TickDownCommandParameter="false" />
|
||||
<controls:TickUpDown
|
||||
Content="Strangle"
|
||||
TickCommand="{Binding strangle}"
|
||||
TickUpParameter="true"
|
||||
TickDownParameter="false" />
|
||||
TickUpCommandParameter="true"
|
||||
TickDownCommandParameter="false" />
|
||||
<controls:TickUpDown
|
||||
Grid.Row="1"
|
||||
Content="ATM Move"
|
||||
TickCommand="{Binding atm_shift}"
|
||||
TickUpParameter="true"
|
||||
TickDownParameter="false" />
|
||||
TickUpCommandParameter="true"
|
||||
TickDownCommandParameter="false" />
|
||||
<GroupBox Header="Fit To Market">
|
||||
<StackPanel>
|
||||
<ComboBox
|
||||
@@ -121,8 +121,8 @@
|
||||
<controls:TickUpDown
|
||||
Content="Global Vol Shift"
|
||||
TickCommand="{Binding vol_shift}"
|
||||
TickUpParameter="true"
|
||||
TickDownParameter="false"
|
||||
TickUpCommandParameter="true"
|
||||
TickDownCommandParameter="false"
|
||||
Visibility="Collapsed" />
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||
/>
|
||||
<RepeatButton Command="{TemplateBinding TickUpCommand}" CommandParameter="{TemplateBinding TickUpParameter}" Grid.Row="0" Grid.Column="1" BorderThickness="0" Focusable="False">
|
||||
<RepeatButton Command="{TemplateBinding TickUpCommand}" CommandParameter="{TemplateBinding TickUpCommandParameter}" Grid.Row="0" Grid.Column="1" BorderThickness="0" Focusable="False">
|
||||
<Path Data="F1 M 0,0 L 2.667,2.66665 L 5.3334,0 L 5.3334,-1.78168 L 2.6667,0.88501 L0,-1.78168 L0,0 Z"
|
||||
Fill="#FF606060" HorizontalAlignment="Right" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5">
|
||||
<Path.RenderTransform>
|
||||
@@ -58,7 +58,7 @@
|
||||
</Path.RenderTransform>
|
||||
</Path>
|
||||
</RepeatButton>
|
||||
<RepeatButton Command="{TemplateBinding TickDownCommand}" CommandParameter="{TemplateBinding TickDownParameter}" Grid.Row="1" Grid.Column="1" BorderThickness="0" Focusable="False">
|
||||
<RepeatButton Command="{TemplateBinding TickDownCommand}" CommandParameter="{TemplateBinding TickDownCommandParameter}" Grid.Row="1" Grid.Column="1" BorderThickness="0" Focusable="False">
|
||||
<Path Data="F1 M 0,0 L 2.667,2.66665 L 5.3334,0 L 5.3334,-1.78168 L 2.6667,0.88501 L0,-1.78168 L0,0 Z"
|
||||
Fill="#FF606060" HorizontalAlignment="Center" VerticalAlignment="Center" />
|
||||
</RepeatButton>
|
||||
@@ -100,7 +100,7 @@
|
||||
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
||||
/>
|
||||
<RepeatButton Command="{TemplateBinding TickUpCommand}" CommandParameter="{TemplateBinding TickUpParameter}" BorderThickness="0" Focusable="False" Visibility="Hidden">
|
||||
<RepeatButton Command="{TemplateBinding TickUpCommand}" CommandParameter="{TemplateBinding TickUpCommandParameter}" BorderThickness="0" Focusable="False" Visibility="Hidden">
|
||||
<Path Data="F1 M 0,0 L 2.667,2.66665 L 5.3334,0 L 5.3334,-1.78168 L 2.6667,0.88501 L0,-1.78168 L0,0 Z"
|
||||
Fill="#FF606060" HorizontalAlignment="Right" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5">
|
||||
<Path.RenderTransform>
|
||||
@@ -108,7 +108,7 @@
|
||||
</Path.RenderTransform>
|
||||
</Path>
|
||||
</RepeatButton>
|
||||
<RepeatButton Command="{TemplateBinding TickDownCommand}" CommandParameter="{TemplateBinding TickDownParameter}" BorderThickness="0" Focusable="False" Visibility="Hidden">
|
||||
<RepeatButton Command="{TemplateBinding TickDownCommand}" CommandParameter="{TemplateBinding TickDownCommandParameter}" BorderThickness="0" Focusable="False" Visibility="Hidden">
|
||||
<Path Data="F1 M 0,0 L 2.667,2.66665 L 5.3334,0 L 5.3334,-1.78168 L 2.6667,0.88501 L0,-1.78168 L0,0 Z"
|
||||
Fill="#FF606060" HorizontalAlignment="Center" VerticalAlignment="Center" />
|
||||
</RepeatButton>
|
||||
|
||||
@@ -17,9 +17,9 @@ namespace mbts.ui.controls {
|
||||
_mouse_wheel_dispatcher.Debounce(_timeout_ms, (a) => {
|
||||
if (ActivateOnMouseWheel) {
|
||||
if (e.Delta > 0) {
|
||||
TickUpCommand.TryExecuteIfCan(TickUpParameter);
|
||||
TickUpCommand.TryExecuteIfCan(TickUpCommandParameter);
|
||||
} else {
|
||||
TickDownCommand.TryExecuteIfCan(TickDownParameter);
|
||||
TickDownCommand.TryExecuteIfCan(TickDownCommandParameter);
|
||||
}
|
||||
e.Handled = true;
|
||||
} else {
|
||||
@@ -33,11 +33,11 @@ namespace mbts.ui.controls {
|
||||
if (Keyboard.Modifiers == ArrowKeyTickModifiers) {
|
||||
switch (e.Key) {
|
||||
case Key.Up:
|
||||
TickUpCommand.TryExecuteIfCan(TickUpParameter);
|
||||
TickUpCommand.TryExecuteIfCan(TickUpCommandParameter);
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Key.Down:
|
||||
TickDownCommand.TryExecuteIfCan(TickDownParameter);
|
||||
TickDownCommand.TryExecuteIfCan(TickDownCommandParameter);
|
||||
e.Handled = true;
|
||||
break;
|
||||
}
|
||||
@@ -45,11 +45,11 @@ namespace mbts.ui.controls {
|
||||
// see: https://stackoverflow.com/questions/3099472/previewkeydown-is-not-seeing-alt-modifiers
|
||||
switch (e.SystemKey) {
|
||||
case Key.Up:
|
||||
TickUpCommand.TryExecuteIfCan(TickUpAltParameter);
|
||||
TickUpCommand.TryExecuteIfCan(TickUpCommandAltParameter);
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Key.Down:
|
||||
TickDownCommand.TryExecuteIfCan(TickDownAltParameter);
|
||||
TickDownCommand.TryExecuteIfCan(TickDownCommandAltParameter);
|
||||
e.Handled = true;
|
||||
break;
|
||||
}
|
||||
@@ -100,56 +100,56 @@ namespace mbts.ui.controls {
|
||||
DependencyProperty.Register("TickDownCommand", typeof(ICommand), typeof(TickUpDown), new PropertyMetadata(null));
|
||||
#endregion
|
||||
|
||||
#region TickUpParameter
|
||||
public object TickUpParameter {
|
||||
get { return GetValue(TickUpParameterProperty); }
|
||||
set { SetValue(TickUpParameterProperty, value); }
|
||||
#region TickUpCommandParameter
|
||||
public object TickUpCommandParameter {
|
||||
get { return GetValue(TickUpCommandParameterProperty); }
|
||||
set { SetValue(TickUpCommandParameterProperty, value); }
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty TickUpParameterProperty =
|
||||
DependencyProperty.Register("TickUpParameter", typeof(object), typeof(TickUpDown), new PropertyMetadata(OnTickUpParameterChanged));
|
||||
public static readonly DependencyProperty TickUpCommandParameterProperty =
|
||||
DependencyProperty.Register("TickUpCommandParameter", typeof(object), typeof(TickUpDown), new PropertyMetadata(OnTickUpCommandParameterChanged));
|
||||
|
||||
static void OnTickUpParameterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
|
||||
d.CoerceValue(TickUpAltParameterProperty);
|
||||
static void OnTickUpCommandParameterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
|
||||
d.CoerceValue(TickUpCommandAltParameterProperty);
|
||||
#endregion
|
||||
|
||||
#region TickDownParameter
|
||||
public object TickDownParameter {
|
||||
get => GetValue(TickDownParameterProperty);
|
||||
set => SetValue(TickDownParameterProperty, value);
|
||||
#region TickDownCommandParameter
|
||||
public object TickDownCommandParameter {
|
||||
get => GetValue(TickDownCommandParameterProperty);
|
||||
set => SetValue(TickDownCommandParameterProperty, value);
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty TickDownParameterProperty =
|
||||
DependencyProperty.Register("TickDownParameter", typeof(object), typeof(TickUpDown), new PropertyMetadata(OnTickDownParameterChanged));
|
||||
public static readonly DependencyProperty TickDownCommandParameterProperty =
|
||||
DependencyProperty.Register("TickDownCommandParameter", typeof(object), typeof(TickUpDown), new PropertyMetadata(OnTickDownCommandParameterChanged));
|
||||
|
||||
static void OnTickDownParameterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
|
||||
d.CoerceValue(TickDownAltParameterProperty);
|
||||
static void OnTickDownCommandParameterChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
|
||||
d.CoerceValue(TickDownCommandAltParameterProperty);
|
||||
#endregion
|
||||
|
||||
#region TickUpAltParameter
|
||||
public object TickUpAltParameter {
|
||||
get { return GetValue(TickUpAltParameterProperty); }
|
||||
set { SetValue(TickUpAltParameterProperty, value); }
|
||||
#region TickUpCommandAltParameter
|
||||
public object TickUpCommandAltParameter {
|
||||
get { return GetValue(TickUpCommandAltParameterProperty); }
|
||||
set { SetValue(TickUpCommandAltParameterProperty, value); }
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty TickUpAltParameterProperty = DependencyProperty.Register(
|
||||
nameof(TickUpAltParameter), typeof(object), typeof(TickUpDown), new PropertyMetadata(null, null, CoerceTickUpAltParameter));
|
||||
public static readonly DependencyProperty TickUpCommandAltParameterProperty = DependencyProperty.Register(
|
||||
nameof(TickUpCommandAltParameter), typeof(object), typeof(TickUpDown), new PropertyMetadata(null, null, CoerceTickUpCommandAltParameter));
|
||||
|
||||
static object CoerceTickUpAltParameter(DependencyObject d, object baseValue) =>
|
||||
baseValue ?? d.GetValue(TickUpParameterProperty);
|
||||
static object CoerceTickUpCommandAltParameter(DependencyObject d, object baseValue) =>
|
||||
baseValue ?? d.GetValue(TickUpCommandParameterProperty);
|
||||
#endregion
|
||||
|
||||
#region TickDownAlt
|
||||
public object TickDownAltParameter {
|
||||
get { return GetValue(TickDownAltParameterProperty); }
|
||||
set { SetValue(TickDownAltParameterProperty, value); }
|
||||
#region TickDownCommandAlt
|
||||
public object TickDownCommandAltParameter {
|
||||
get { return GetValue(TickDownCommandAltParameterProperty); }
|
||||
set { SetValue(TickDownCommandAltParameterProperty, value); }
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty TickDownAltParameterProperty = DependencyProperty.Register(
|
||||
nameof(TickDownAltParameter), typeof(object), typeof(TickUpDown), new PropertyMetadata(null, null, CoerceTickDownAltParameter));
|
||||
public static readonly DependencyProperty TickDownCommandAltParameterProperty = DependencyProperty.Register(
|
||||
nameof(TickDownCommandAltParameter), typeof(object), typeof(TickUpDown), new PropertyMetadata(null, null, CoerceTickDownCommandAltParameter));
|
||||
|
||||
static object CoerceTickDownAltParameter(DependencyObject d, object baseValue) =>
|
||||
baseValue ?? d.GetValue(TickDownParameterProperty);
|
||||
static object CoerceTickDownCommandAltParameter(DependencyObject d, object baseValue) =>
|
||||
baseValue ?? d.GetValue(TickDownCommandParameterProperty);
|
||||
#endregion
|
||||
|
||||
#region ActivateOnMouseWheel
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
Grid.Column="1"
|
||||
HorizontalAlignment="Right"
|
||||
Command="{TemplateBinding TickUpCommand}"
|
||||
CommandParameter="{TemplateBinding TickUpParameter}"
|
||||
CommandParameter="{TemplateBinding TickUpCommandParameter}"
|
||||
Visibility="Collapsed"
|
||||
Focusable="False"
|
||||
>
|
||||
@@ -46,7 +46,7 @@
|
||||
Grid.Column="1"
|
||||
HorizontalAlignment="Right"
|
||||
Command="{TemplateBinding TickDownCommand}"
|
||||
CommandParameter="{TemplateBinding TickDownParameter}"
|
||||
CommandParameter="{TemplateBinding TickDownCommandParameter}"
|
||||
Visibility="Collapsed"
|
||||
Focusable="False"
|
||||
>
|
||||
|
||||
@@ -80,10 +80,10 @@ namespace mbts.ui.controls {
|
||||
time.CommandBindings.Add(new CommandBinding(TextBoxBehavior.SelectAllCommand, TextBoxBehavior.SelectAllCommandExecutedHandler));
|
||||
|
||||
time.SetBinding(TickUpDown.TickCommandProperty, new Binding("tick_time") { Source = _controller });
|
||||
time.TickUpParameter = 1;
|
||||
time.TickDownParameter = -1;
|
||||
time.TickUpAltParameter = 60;
|
||||
time.TickDownAltParameter = -60;
|
||||
time.TickUpCommandParameter = 1;
|
||||
time.TickDownCommandParameter = -1;
|
||||
time.TickUpCommandAltParameter = 60;
|
||||
time.TickDownCommandAltParameter = -60;
|
||||
_time_text.SetBinding(TextBox.TextProperty, new Binding("time_text") { Source = _controller, ValidatesOnExceptions = true });
|
||||
_hooks.Add(_time_text.SubscribePreviewTextInput((s, e) => {
|
||||
string preview = _time_text.PeekText(e);
|
||||
@@ -97,24 +97,24 @@ namespace mbts.ui.controls {
|
||||
}));
|
||||
|
||||
month.SetBinding(TickUpDown.TickCommandProperty, new Binding("tick_month") { Source = _controller });
|
||||
month.TickUpParameter = 1;
|
||||
month.TickDownParameter = -1;
|
||||
month.TickUpCommandParameter = 1;
|
||||
month.TickDownCommandParameter = -1;
|
||||
_month_text.SetBinding(TextBox.TextProperty, new Binding("month_text") { Source = _controller });
|
||||
_hooks.Add(_month_text.SubscribePreviewTextInput((s, e) =>
|
||||
e.Handled = !RegexFilters.Time.MonthAbbrev.IsMatch(_month_text.PeekText(e))
|
||||
));
|
||||
|
||||
day.SetBinding(TickUpDown.TickCommandProperty, new Binding("tick_day") { Source = _controller });
|
||||
day.TickUpParameter = 1;
|
||||
day.TickDownParameter = -1;
|
||||
day.TickUpCommandParameter = 1;
|
||||
day.TickDownCommandParameter = -1;
|
||||
_day_text.SetBinding(TextBox.TextProperty, new Binding("day_text") { Source = _controller });
|
||||
_hooks.Add(_day_text.SubscribePreviewTextInput((s, e) =>
|
||||
e.Handled = !RegexFilters.Time.DaysInMonth.IsMatch(_day_text.PeekText(e))
|
||||
));
|
||||
|
||||
year.SetBinding(TickUpDown.TickCommandProperty, new Binding("tick_year") { Source = _controller });
|
||||
year.TickUpParameter = 1;
|
||||
year.TickDownParameter = -1;
|
||||
year.TickUpCommandParameter = 1;
|
||||
year.TickDownCommandParameter = -1;
|
||||
_year_text.SetBinding(TextBox.TextProperty, new Binding("year_text") { Source = _controller });
|
||||
_hooks.Add(_year_text.SubscribePreviewTextInput((s, e) =>
|
||||
e.Handled = !RegexFilters.Time.Year.IsMatch(_year_text.PeekText(e))
|
||||
|
||||
Reference in new issue
Block a user