فهرست منبع

Make EnumExtensions internal.

Steven Kirk 2 سال پیش
والد
کامیت
0b1b3476fb

+ 1 - 1
samples/GpuInterop/VulkanDemo/VulkanContext.cs

@@ -174,7 +174,7 @@ public unsafe class VulkanContext : IDisposable
                 for (uint queueFamilyIndex = 0; queueFamilyIndex < queueFamilyCount; queueFamilyIndex++)
                 for (uint queueFamilyIndex = 0; queueFamilyIndex < queueFamilyCount; queueFamilyIndex++)
                 {
                 {
                     var family = familyProperties[queueFamilyIndex];
                     var family = familyProperties[queueFamilyIndex];
-                    if (!family.QueueFlags.HasAllFlags(QueueFlags.GraphicsBit))
+                    if (!family.QueueFlags.HasFlag(QueueFlags.GraphicsBit))
                         continue;
                         continue;
 
 
 
 

+ 3 - 3
samples/VirtualizationDemo/ViewModels/PlaygroundPageViewModel.cs

@@ -24,19 +24,19 @@ public class PlaygroundPageViewModel : ViewModelBase
 
 
     public bool Multiple
     public bool Multiple
     {
     {
-        get => _selectionMode.HasAnyFlag(SelectionMode.Multiple);
+        get => _selectionMode.HasFlag(SelectionMode.Multiple);
         set => SetSelectionMode(SelectionMode.Multiple, value);
         set => SetSelectionMode(SelectionMode.Multiple, value);
     }
     }
 
 
     public bool Toggle
     public bool Toggle
     {
     {
-        get => _selectionMode.HasAnyFlag(SelectionMode.Toggle);
+        get => _selectionMode.HasFlag(SelectionMode.Toggle);
         set => SetSelectionMode(SelectionMode.Toggle, value);
         set => SetSelectionMode(SelectionMode.Toggle, value);
     }
     }
 
 
     public bool AlwaysSelected
     public bool AlwaysSelected
     {
     {
-        get => _selectionMode.HasAnyFlag(SelectionMode.AlwaysSelected);
+        get => _selectionMode.HasFlag(SelectionMode.AlwaysSelected);
         set => SetSelectionMode(SelectionMode.AlwaysSelected, value);
         set => SetSelectionMode(SelectionMode.AlwaysSelected, value);
     }
     }
 
 

+ 1 - 1
src/Avalonia.Base/EnumExtensions.cs

@@ -6,7 +6,7 @@ namespace Avalonia
     /// <summary>
     /// <summary>
     /// Provides extension methods for enums.
     /// Provides extension methods for enums.
     /// </summary>
     /// </summary>
-    public static class EnumExtensions
+    internal static class EnumExtensions
     {
     {
             
             
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

+ 2 - 2
src/Avalonia.Controls.ItemsRepeater/Controls/RepeaterLayoutContext.cs

@@ -53,8 +53,8 @@ namespace Avalonia.Controls
         {
         {
             return _owner.GetElementImpl(
             return _owner.GetElementImpl(
                 index,
                 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)!;
         protected override object GetItemAtCore(int index) => _owner.ItemsSourceView!.GetAt(index)!;

+ 2 - 2
src/Headless/Avalonia.Headless.Vnc/HeadlessVncFramebufferSource.cs

@@ -40,11 +40,11 @@ namespace Avalonia.Headless.Vnc
                 {
                 {
                     Window?.MouseMove(pt);
                     Window?.MouseMove(pt);
                     foreach (var btn in CheckedButtons)
                     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);
                             Window?.MouseUp(pt, TranslateButton(btn), modifiers);
                     
                     
                     foreach (var btn in CheckedButtons)
                     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);
                             Window?.MouseDown(pt, TranslateButton(btn), modifiers);
                     _previousButtons = buttons;
                     _previousButtons = buttons;
                 }, DispatcherPriority.Input);
                 }, DispatcherPriority.Input);

+ 4 - 4
src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs

@@ -141,13 +141,13 @@ namespace Avalonia.Win32.Interop.Wpf
         {
         {
             var state = Keyboard.Modifiers;
             var state = Keyboard.Modifiers;
             var rv = default(RawInputModifiers);
             var rv = default(RawInputModifiers);
-            if (state.HasAllFlags(ModifierKeys.Windows))
+            if (state.HasFlag(ModifierKeys.Windows))
                 rv |= RawInputModifiers.Meta;
                 rv |= RawInputModifiers.Meta;
-            if (state.HasAllFlags(ModifierKeys.Alt))
+            if (state.HasFlag(ModifierKeys.Alt))
                 rv |= RawInputModifiers.Alt;
                 rv |= RawInputModifiers.Alt;
-            if (state.HasAllFlags(ModifierKeys.Control))
+            if (state.HasFlag(ModifierKeys.Control))
                 rv |= RawInputModifiers.Control;
                 rv |= RawInputModifiers.Control;
-            if (state.HasAllFlags(ModifierKeys.Shift))
+            if (state.HasFlag(ModifierKeys.Shift))
                 rv |= RawInputModifiers.Shift;
                 rv |= RawInputModifiers.Shift;
             if (e != null)
             if (e != null)
             {
             {

+ 3 - 3
tests/Avalonia.IntegrationTests.Appium/PlatformFactAttribute.cs

@@ -44,11 +44,11 @@ namespace Avalonia
         private bool IsSupported()
         private bool IsSupported()
         {
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                return Platforms.HasAnyFlag(TestPlatforms.Windows);
+                return Platforms.HasFlag(TestPlatforms.Windows);
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                return Platforms.HasAnyFlag(TestPlatforms.MacOS);
+                return Platforms.HasFlag(TestPlatforms.MacOS);
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                return Platforms.HasAnyFlag(TestPlatforms.Linux);
+                return Platforms.HasFlag(TestPlatforms.Linux);
             return false;
             return false;
         }
         }
     }
     }

+ 2 - 2
tests/Avalonia.IntegrationTests.Appium/PlatformTheoryAttribute.cs

@@ -27,9 +27,9 @@ namespace Avalonia.IntegrationTests.Appium
         private bool IsSupported()
         private bool IsSupported()
         {
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                return Platforms.HasAnyFlag(TestPlatforms.Windows);
+                return Platforms.HasFlag(TestPlatforms.Windows);
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                return Platforms.HasAnyFlag(TestPlatforms.MacOS);
+                return Platforms.HasFlag(TestPlatforms.MacOS);
             return false;
             return false;
         }
         }
     }
     }