Browse Source

Tabs to spaces

pull/7422/head
robloo 5 years ago
parent
commit
ac1d261d4c
  1. 116
      src/Avalonia.Controls/SplitButton/SplitButton.cs

116
src/Avalonia.Controls/SplitButton/SplitButton.cs

@ -48,9 +48,9 @@ namespace Avalonia.Controls
AvaloniaProperty.Register<SplitButton, object>( AvaloniaProperty.Register<SplitButton, object>(
nameof(CommandParameter)); nameof(CommandParameter));
/// <summary> /// <summary>
/// Defines the <see cref="Flyout"/> property /// Defines the <see cref="Flyout"/> property
/// </summary> /// </summary>
public static readonly StyledProperty<FlyoutBase> FlyoutProperty = public static readonly StyledProperty<FlyoutBase> FlyoutProperty =
AvaloniaProperty.Register<SplitButton, FlyoutBase>( AvaloniaProperty.Register<SplitButton, FlyoutBase>(
nameof(Flyout)); nameof(Flyout));
@ -67,7 +67,7 @@ namespace Avalonia.Controls
private PointerType _lastPointerType = PointerType.Mouse; private PointerType _lastPointerType = PointerType.Mouse;
private CompositeDisposable _buttonPropertyChangedDisposable; private CompositeDisposable _buttonPropertyChangedDisposable;
private IDisposable _flyoutPropertyChangedDisposable; private IDisposable _flyoutPropertyChangedDisposable;
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// //
@ -88,32 +88,32 @@ namespace Avalonia.Controls
// //
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
/// <summary> /// <summary>
/// Gets or sets the <see cref="ICommand"/> invoked when the primary part is pressed. /// Gets or sets the <see cref="ICommand"/> invoked when the primary part is pressed.
/// </summary> /// </summary>
public ICommand Command public ICommand Command
{ {
get => _Command; get => _Command;
set => SetAndRaise(CommandProperty, ref _Command, value); set => SetAndRaise(CommandProperty, ref _Command, value);
} }
/// <summary> /// <summary>
/// Gets or sets a parameter to be passed to the <see cref="Command"/>. /// Gets or sets a parameter to be passed to the <see cref="Command"/>.
/// </summary> /// </summary>
public object CommandParameter public object CommandParameter
{ {
get => GetValue(CommandParameterProperty); get => GetValue(CommandParameterProperty);
set => SetValue(CommandParameterProperty, value); set => SetValue(CommandParameterProperty, value);
} }
/// <summary> /// <summary>
/// Gets or sets the <see cref="FlyoutBase"/> that is shown when the secondary part is pressed. /// Gets or sets the <see cref="FlyoutBase"/> that is shown when the secondary part is pressed.
/// </summary> /// </summary>
public FlyoutBase Flyout public FlyoutBase Flyout
{ {
get => GetValue(FlyoutProperty); get => GetValue(FlyoutProperty);
set => SetValue(FlyoutProperty, value); set => SetValue(FlyoutProperty, value);
} }
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// //
@ -338,12 +338,12 @@ namespace Avalonia.Controls
/// <inheritdoc/> /// <inheritdoc/>
protected override void OnApplyTemplate(TemplateAppliedEventArgs e) protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{ {
UnregisterEvents(); UnregisterEvents();
UnregisterFlyoutEvents(Flyout); UnregisterFlyoutEvents(Flyout);
_primaryButton = e.NameScope.Find<Button>("PrimaryButton"); _primaryButton = e.NameScope.Find<Button>("PrimaryButton");
_secondaryButton = e.NameScope.Find<Button>("SecondaryButton"); _secondaryButton = e.NameScope.Find<Button>("SecondaryButton");
_buttonPropertyChangedDisposable = new CompositeDisposable(); _buttonPropertyChangedDisposable = new CompositeDisposable();
@ -353,7 +353,7 @@ namespace Avalonia.Controls
_primaryButton.GetPropertyChangedObservable(Button.IsPressedProperty); _primaryButton.GetPropertyChangedObservable(Button.IsPressedProperty);
_buttonPropertyChangedDisposable.Add(_primaryButton.GetPropertyChangedObservable(Button.IsPressedProperty).Subscribe(Button_VisualPropertyChanged)); _buttonPropertyChangedDisposable.Add(_primaryButton.GetPropertyChangedObservable(Button.IsPressedProperty).Subscribe(Button_VisualPropertyChanged));
_buttonPropertyChangedDisposable.Add(_primaryButton.GetPropertyChangedObservable(Button.IsPointerOverProperty).Subscribe(Button_VisualPropertyChanged)); _buttonPropertyChangedDisposable.Add(_primaryButton.GetPropertyChangedObservable(Button.IsPointerOverProperty).Subscribe(Button_VisualPropertyChanged));
// Register for pointer events to keep track of the last used pointer type and update visual states // Register for pointer events to keep track of the last used pointer type and update visual states
@ -410,13 +410,13 @@ namespace Avalonia.Controls
} }
/// <inheritdoc/> /// <inheritdoc/>
protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> changedEventArgs) protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> changedEventArgs)
{ {
if (changedEventArgs.Property == FlyoutProperty) if (changedEventArgs.Property == FlyoutProperty)
{ {
// Must unregister events here while a ref to the old flyout still exists // Must unregister events here while a ref to the old flyout still exists
if (changedEventArgs.OldValue.GetValueOrDefault() is FlyoutBase oldFlyout) if (changedEventArgs.OldValue.GetValueOrDefault() is FlyoutBase oldFlyout)
{ {
UnregisterFlyoutEvents(oldFlyout); UnregisterFlyoutEvents(oldFlyout);
} }
@ -428,12 +428,12 @@ namespace Avalonia.Controls
UpdatePseudoClasses(); UpdatePseudoClasses();
} }
base.OnPropertyChanged(changedEventArgs); base.OnPropertyChanged(changedEventArgs);
} }
/// <inheritdoc/> /// <inheritdoc/>
protected override void OnKeyDown(KeyEventArgs e) protected override void OnKeyDown(KeyEventArgs e)
{ {
var key = e.Key; var key = e.Key;
if (key == Key.Space || key == Key.Enter) // Key.GamepadA is not currently supported if (key == Key.Space || key == Key.Enter) // Key.GamepadA is not currently supported
@ -442,12 +442,12 @@ namespace Avalonia.Controls
UpdatePseudoClasses(); UpdatePseudoClasses();
} }
base.OnKeyDown(e); base.OnKeyDown(e);
} }
/// <inheritdoc/> /// <inheritdoc/>
protected override void OnKeyUp(KeyEventArgs e) protected override void OnKeyUp(KeyEventArgs e)
{ {
var key = e.Key; var key = e.Key;
if (key == Key.Space || key == Key.Enter) // Key.GamepadA is not currently supported if (key == Key.Space || key == Key.Enter) // Key.GamepadA is not currently supported
@ -538,14 +538,14 @@ namespace Avalonia.Controls
/// Event handler for when pointer events occur in the primary or secondary buttons. /// Event handler for when pointer events occur in the primary or secondary buttons.
/// </summary> /// </summary>
private void Button_PointerEvent(object sender, PointerEventArgs e) private void Button_PointerEvent(object sender, PointerEventArgs e)
{ {
// Warning: Code must match with Button_PointerCaptureLost // Warning: Code must match with Button_PointerCaptureLost
if (_lastPointerType != e.Pointer.Type) if (_lastPointerType != e.Pointer.Type)
{ {
_lastPointerType = e.Pointer.Type; _lastPointerType = e.Pointer.Type;
UpdatePseudoClasses(); UpdatePseudoClasses();
} }
} }
/// <summary> /// <summary>
/// Event handler for when the pointer capture is lost in the primary or secondary buttons. /// Event handler for when the pointer capture is lost in the primary or secondary buttons.
@ -553,15 +553,15 @@ namespace Avalonia.Controls
/// <remarks> /// <remarks>
/// In upstream WinUI this is not a separate event handler. However, Avalonia has different args. /// In upstream WinUI this is not a separate event handler. However, Avalonia has different args.
/// </remarks> /// </remarks>
private void Button_PointerCaptureLost(object sender, PointerCaptureLostEventArgs e) private void Button_PointerCaptureLost(object sender, PointerCaptureLostEventArgs e)
{ {
// Warning: Code must match with Button_PointerEvent // Warning: Code must match with Button_PointerEvent
if (_lastPointerType != e.Pointer.Type) if (_lastPointerType != e.Pointer.Type)
{ {
_lastPointerType = e.Pointer.Type; _lastPointerType = e.Pointer.Type;
UpdatePseudoClasses(); UpdatePseudoClasses();
} }
} }
/// <summary> /// <summary>
/// Called when a primary or secondary button property changes that affects the visual states. /// Called when a primary or secondary button property changes that affects the visual states.

Loading…
Cancel
Save