From 0b1b3476fbb13597d7c9d19ef6ac84696ad3e40a Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 18 May 2023 15:39:18 +0200 Subject: [PATCH] Make EnumExtensions internal. --- samples/GpuInterop/VulkanDemo/VulkanContext.cs | 2 +- .../ViewModels/PlaygroundPageViewModel.cs | 6 +++--- src/Avalonia.Base/EnumExtensions.cs | 2 +- .../Controls/RepeaterLayoutContext.cs | 4 ++-- .../Avalonia.Headless.Vnc/HeadlessVncFramebufferSource.cs | 4 ++-- src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs | 8 ++++---- .../PlatformFactAttribute.cs | 6 +++--- .../PlatformTheoryAttribute.cs | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/samples/GpuInterop/VulkanDemo/VulkanContext.cs b/samples/GpuInterop/VulkanDemo/VulkanContext.cs index 1d44549089..a810a4b9f7 100644 --- a/samples/GpuInterop/VulkanDemo/VulkanContext.cs +++ b/samples/GpuInterop/VulkanDemo/VulkanContext.cs @@ -174,7 +174,7 @@ public unsafe class VulkanContext : IDisposable for (uint queueFamilyIndex = 0; queueFamilyIndex < queueFamilyCount; queueFamilyIndex++) { var family = familyProperties[queueFamilyIndex]; - if (!family.QueueFlags.HasAllFlags(QueueFlags.GraphicsBit)) + if (!family.QueueFlags.HasFlag(QueueFlags.GraphicsBit)) continue; diff --git a/samples/VirtualizationDemo/ViewModels/PlaygroundPageViewModel.cs b/samples/VirtualizationDemo/ViewModels/PlaygroundPageViewModel.cs index 98ab91b0a6..748654594b 100644 --- a/samples/VirtualizationDemo/ViewModels/PlaygroundPageViewModel.cs +++ b/samples/VirtualizationDemo/ViewModels/PlaygroundPageViewModel.cs @@ -24,19 +24,19 @@ public class PlaygroundPageViewModel : ViewModelBase public bool Multiple { - get => _selectionMode.HasAnyFlag(SelectionMode.Multiple); + get => _selectionMode.HasFlag(SelectionMode.Multiple); set => SetSelectionMode(SelectionMode.Multiple, value); } public bool Toggle { - get => _selectionMode.HasAnyFlag(SelectionMode.Toggle); + get => _selectionMode.HasFlag(SelectionMode.Toggle); set => SetSelectionMode(SelectionMode.Toggle, value); } public bool AlwaysSelected { - get => _selectionMode.HasAnyFlag(SelectionMode.AlwaysSelected); + get => _selectionMode.HasFlag(SelectionMode.AlwaysSelected); set => SetSelectionMode(SelectionMode.AlwaysSelected, value); } diff --git a/src/Avalonia.Base/EnumExtensions.cs b/src/Avalonia.Base/EnumExtensions.cs index 9b74266b09..c2b29c6620 100644 --- a/src/Avalonia.Base/EnumExtensions.cs +++ b/src/Avalonia.Base/EnumExtensions.cs @@ -6,7 +6,7 @@ namespace Avalonia /// /// Provides extension methods for enums. /// - public static class EnumExtensions + internal static class EnumExtensions { [MethodImpl(MethodImplOptions.AggressiveInlining)] diff --git a/src/Avalonia.Controls.ItemsRepeater/Controls/RepeaterLayoutContext.cs b/src/Avalonia.Controls.ItemsRepeater/Controls/RepeaterLayoutContext.cs index 49c8b9ff92..d03949c1c2 100644 --- a/src/Avalonia.Controls.ItemsRepeater/Controls/RepeaterLayoutContext.cs +++ b/src/Avalonia.Controls.ItemsRepeater/Controls/RepeaterLayoutContext.cs @@ -53,8 +53,8 @@ namespace Avalonia.Controls { return _owner.GetElementImpl( index, - options.HasAllFlags(ElementRealizationOptions.ForceCreate), - options.HasAllFlags(ElementRealizationOptions.SuppressAutoRecycle)); + options.HasFlag(ElementRealizationOptions.ForceCreate), + options.HasFlag(ElementRealizationOptions.SuppressAutoRecycle)); } protected override object GetItemAtCore(int index) => _owner.ItemsSourceView!.GetAt(index)!; diff --git a/src/Headless/Avalonia.Headless.Vnc/HeadlessVncFramebufferSource.cs b/src/Headless/Avalonia.Headless.Vnc/HeadlessVncFramebufferSource.cs index 24703003da..1a7bb2ec2f 100644 --- a/src/Headless/Avalonia.Headless.Vnc/HeadlessVncFramebufferSource.cs +++ b/src/Headless/Avalonia.Headless.Vnc/HeadlessVncFramebufferSource.cs @@ -40,11 +40,11 @@ namespace Avalonia.Headless.Vnc { Window?.MouseMove(pt); foreach (var btn in CheckedButtons) - if (_previousButtons.HasAllFlags(btn) && !buttons.HasAllFlags(btn)) + if (_previousButtons.HasFlag(btn) && !buttons.HasFlag(btn)) Window?.MouseUp(pt, TranslateButton(btn), modifiers); foreach (var btn in CheckedButtons) - if (!_previousButtons.HasAllFlags(btn) && buttons.HasAllFlags(btn)) + if (!_previousButtons.HasFlag(btn) && buttons.HasFlag(btn)) Window?.MouseDown(pt, TranslateButton(btn), modifiers); _previousButtons = buttons; }, DispatcherPriority.Input); diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs index 24fd7e3933..8025779c90 100644 --- a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs +++ b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs @@ -141,13 +141,13 @@ namespace Avalonia.Win32.Interop.Wpf { var state = Keyboard.Modifiers; var rv = default(RawInputModifiers); - if (state.HasAllFlags(ModifierKeys.Windows)) + if (state.HasFlag(ModifierKeys.Windows)) rv |= RawInputModifiers.Meta; - if (state.HasAllFlags(ModifierKeys.Alt)) + if (state.HasFlag(ModifierKeys.Alt)) rv |= RawInputModifiers.Alt; - if (state.HasAllFlags(ModifierKeys.Control)) + if (state.HasFlag(ModifierKeys.Control)) rv |= RawInputModifiers.Control; - if (state.HasAllFlags(ModifierKeys.Shift)) + if (state.HasFlag(ModifierKeys.Shift)) rv |= RawInputModifiers.Shift; if (e != null) { diff --git a/tests/Avalonia.IntegrationTests.Appium/PlatformFactAttribute.cs b/tests/Avalonia.IntegrationTests.Appium/PlatformFactAttribute.cs index 17c42216e9..00408a83e4 100644 --- a/tests/Avalonia.IntegrationTests.Appium/PlatformFactAttribute.cs +++ b/tests/Avalonia.IntegrationTests.Appium/PlatformFactAttribute.cs @@ -44,11 +44,11 @@ namespace Avalonia private bool IsSupported() { if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - return Platforms.HasAnyFlag(TestPlatforms.Windows); + return Platforms.HasFlag(TestPlatforms.Windows); if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) - return Platforms.HasAnyFlag(TestPlatforms.MacOS); + return Platforms.HasFlag(TestPlatforms.MacOS); if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) - return Platforms.HasAnyFlag(TestPlatforms.Linux); + return Platforms.HasFlag(TestPlatforms.Linux); return false; } } diff --git a/tests/Avalonia.IntegrationTests.Appium/PlatformTheoryAttribute.cs b/tests/Avalonia.IntegrationTests.Appium/PlatformTheoryAttribute.cs index 46a8e1af98..011ffa90fd 100644 --- a/tests/Avalonia.IntegrationTests.Appium/PlatformTheoryAttribute.cs +++ b/tests/Avalonia.IntegrationTests.Appium/PlatformTheoryAttribute.cs @@ -27,9 +27,9 @@ namespace Avalonia.IntegrationTests.Appium private bool IsSupported() { if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - return Platforms.HasAnyFlag(TestPlatforms.Windows); + return Platforms.HasFlag(TestPlatforms.Windows); if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) - return Platforms.HasAnyFlag(TestPlatforms.MacOS); + return Platforms.HasFlag(TestPlatforms.MacOS); return false; } }