diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.ExpandCollapse.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.ExpandCollapse.cs index 34ae969afe..5f3f863493 100644 --- a/src/Windows/Avalonia.Win32/Automation/AutomationNode.ExpandCollapse.cs +++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.ExpandCollapse.cs @@ -8,12 +8,12 @@ namespace Avalonia.Win32.Automation { internal partial class AutomationNode : UIA.IExpandCollapseProvider { - public ExpandCollapseState ExpandCollapseState + ExpandCollapseState UIA.IExpandCollapseProvider.ExpandCollapseState { get => InvokeSync(x => x.ExpandCollapseState); } - public void Expand() => InvokeSync(x => x.Expand()); - public void Collapse() => InvokeSync(x => x.Collapse()); + void UIA.IExpandCollapseProvider.Expand() => InvokeSync(x => x.Expand()); + void UIA.IExpandCollapseProvider.Collapse() => InvokeSync(x => x.Collapse()); } } diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.RangeValue.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.RangeValue.cs index d7e97cb30c..b91cb76888 100644 --- a/src/Windows/Avalonia.Win32/Automation/AutomationNode.RangeValue.cs +++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.RangeValue.cs @@ -8,11 +8,11 @@ namespace Avalonia.Win32.Automation internal partial class AutomationNode : UIA.IRangeValueProvider { double UIA.IRangeValueProvider.Value => InvokeSync(x => x.Value); - public bool IsReadOnly => InvokeSync(x => x.IsReadOnly); - public double Maximum => InvokeSync(x => x.Maximum); - public double Minimum => InvokeSync(x => x.Minimum); - public double LargeChange => 1; - public double SmallChange => 1; + bool UIA.IRangeValueProvider.IsReadOnly => InvokeSync(x => x.IsReadOnly); + double UIA.IRangeValueProvider.Maximum => InvokeSync(x => x.Maximum); + double UIA.IRangeValueProvider.Minimum => InvokeSync(x => x.Minimum); + double UIA.IRangeValueProvider.LargeChange => 1; + double UIA.IRangeValueProvider.SmallChange => 1; public void SetValue(double value) => InvokeSync(x => x.SetValue(value)); } diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.Scroll.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Scroll.cs index 55f1aba71c..4f2d4ae269 100644 --- a/src/Windows/Avalonia.Win32/Automation/AutomationNode.Scroll.cs +++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Scroll.cs @@ -7,24 +7,24 @@ namespace Avalonia.Win32.Automation { internal partial class AutomationNode : UIA.IScrollProvider, UIA.IScrollItemProvider { - public bool HorizontallyScrollable => InvokeSync(x => x.HorizontallyScrollable); - public double HorizontalScrollPercent => InvokeSync(x => x.HorizontalScrollPercent); - public double HorizontalViewSize => InvokeSync(x => x.HorizontalViewSize); - public bool VerticallyScrollable => InvokeSync(x => x.VerticallyScrollable); - public double VerticalScrollPercent => InvokeSync(x => x.VerticalScrollPercent); - public double VerticalViewSize => InvokeSync(x => x.VerticalViewSize); + bool UIA.IScrollProvider.HorizontallyScrollable => InvokeSync(x => x.HorizontallyScrollable); + double UIA.IScrollProvider.HorizontalScrollPercent => InvokeSync(x => x.HorizontalScrollPercent); + double UIA.IScrollProvider.HorizontalViewSize => InvokeSync(x => x.HorizontalViewSize); + bool UIA.IScrollProvider.VerticallyScrollable => InvokeSync(x => x.VerticallyScrollable); + double UIA.IScrollProvider.VerticalScrollPercent => InvokeSync(x => x.VerticalScrollPercent); + double UIA.IScrollProvider.VerticalViewSize => InvokeSync(x => x.VerticalViewSize); - public void Scroll(ScrollAmount horizontalAmount, ScrollAmount verticalAmount) + void UIA.IScrollProvider.Scroll(ScrollAmount horizontalAmount, ScrollAmount verticalAmount) { InvokeSync(x => x.Scroll(horizontalAmount, verticalAmount)); } - public void SetScrollPercent(double horizontalPercent, double verticalPercent) + void UIA.IScrollProvider.SetScrollPercent(double horizontalPercent, double verticalPercent) { InvokeSync(x => x.SetScrollPercent(horizontalPercent, verticalPercent)); } - public void ScrollIntoView() + void UIA.IScrollItemProvider.ScrollIntoView() { InvokeSync(() => Peer.BringIntoView()); } diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.Selection.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Selection.cs index c41ace4aa8..61903ab5b0 100644 --- a/src/Windows/Avalonia.Win32/Automation/AutomationNode.Selection.cs +++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Selection.cs @@ -11,11 +11,11 @@ namespace Avalonia.Win32.Automation { internal partial class AutomationNode : UIA.ISelectionProvider, UIA.ISelectionItemProvider { - public bool CanSelectMultiple => InvokeSync(x => x.CanSelectMultiple); - public bool IsSelectionRequired => InvokeSync(x => x.IsSelectionRequired); - public bool IsSelected => InvokeSync(x => x.IsSelected); + bool UIA.ISelectionProvider.CanSelectMultiple => InvokeSync(x => x.CanSelectMultiple); + bool UIA.ISelectionProvider.IsSelectionRequired => InvokeSync(x => x.IsSelectionRequired); + bool UIA.ISelectionItemProvider.IsSelected => InvokeSync(x => x.IsSelected); - public UIA.IRawElementProviderSimple? SelectionContainer + UIA.IRawElementProviderSimple? UIA.ISelectionItemProvider.SelectionContainer { get { @@ -24,15 +24,15 @@ namespace Avalonia.Win32.Automation } } - public UIA.IRawElementProviderSimple[] GetSelection() + UIA.IRawElementProviderSimple[] UIA.ISelectionProvider.GetSelection() { var peers = InvokeSync>(x => x.GetSelection()); return peers?.Select(x => (UIA.IRawElementProviderSimple)GetOrCreate(x)!).ToArray() ?? Array.Empty(); } - public void AddToSelection() => InvokeSync(x => x.AddToSelection()); - public void RemoveFromSelection() => InvokeSync(x => x.RemoveFromSelection()); - public void Select() => InvokeSync(x => x.Select()); + void UIA.ISelectionItemProvider.AddToSelection() => InvokeSync(x => x.AddToSelection()); + void UIA.ISelectionItemProvider.RemoveFromSelection() => InvokeSync(x => x.RemoveFromSelection()); + void UIA.ISelectionItemProvider.Select() => InvokeSync(x => x.Select()); } } diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.Toggle.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Toggle.cs index 9047555785..38f4d80946 100644 --- a/src/Windows/Avalonia.Win32/Automation/AutomationNode.Toggle.cs +++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Toggle.cs @@ -7,7 +7,7 @@ namespace Avalonia.Win32.Automation { internal partial class AutomationNode : UIA.IToggleProvider { - public ToggleState ToggleState => InvokeSync(x => x.ToggleState); - public void Toggle() => InvokeSync(x => x.Toggle()); + ToggleState UIA.IToggleProvider.ToggleState => InvokeSync(x => x.ToggleState); + void UIA.IToggleProvider.Toggle() => InvokeSync(x => x.Toggle()); } } diff --git a/src/Windows/Avalonia.Win32/Automation/AutomationNode.Value.cs b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Value.cs index 06e6708663..34f5dfe0b9 100644 --- a/src/Windows/Avalonia.Win32/Automation/AutomationNode.Value.cs +++ b/src/Windows/Avalonia.Win32/Automation/AutomationNode.Value.cs @@ -8,9 +8,10 @@ namespace Avalonia.Win32.Automation { internal partial class AutomationNode : UIA.IValueProvider { - public string? Value => InvokeSync(x => x.Value); + bool UIA.IValueProvider.IsReadOnly => InvokeSync(x => x.IsReadOnly); + string? UIA.IValueProvider.Value => InvokeSync(x => x.Value); - public void SetValue([MarshalAs(UnmanagedType.LPWStr)] string? value) + void UIA.IValueProvider.SetValue([MarshalAs(UnmanagedType.LPWStr)] string? value) { InvokeSync(x => x.SetValue(value)); }