Browse Source
Merge pull request #10155 from workgroupengineering/fixes/Warnings/misc
fix: misc warning
pull/10160/head
Max Katz
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
2 additions and
20 deletions
-
samples/ControlCatalog/Pages/GesturePage.cs
-
samples/GpuInterop/VulkanDemo/VulkanDemoControl.cs
-
src/Avalonia.Base/Platform/PlatformGraphicsExternalMemory.cs
-
src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
-
tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
|
|
@ -70,7 +70,6 @@ namespace ControlCatalog.Pages |
|
|
|
|
|
|
|
|
_currentScale = 1; |
|
|
_currentScale = 1; |
|
|
Vector3 currentOffset = default; |
|
|
Vector3 currentOffset = default; |
|
|
bool isZooming = false; |
|
|
|
|
|
|
|
|
|
|
|
CompositionVisual? compositionVisual = null; |
|
|
CompositionVisual? compositionVisual = null; |
|
|
|
|
|
|
|
|
|
|
|
@ -1,24 +1,12 @@ |
|
|
using System; |
|
|
using System; |
|
|
using System.Collections; |
|
|
|
|
|
using System.Collections.Generic; |
|
|
|
|
|
using System.Linq; |
|
|
|
|
|
using System.Runtime.InteropServices; |
|
|
|
|
|
using System.Threading.Tasks; |
|
|
using System.Threading.Tasks; |
|
|
using Avalonia; |
|
|
using Avalonia; |
|
|
using Avalonia.Platform; |
|
|
|
|
|
using Avalonia.Rendering.Composition; |
|
|
using Avalonia.Rendering.Composition; |
|
|
using Silk.NET.Core; |
|
|
|
|
|
using Silk.NET.Vulkan; |
|
|
|
|
|
using Silk.NET.Vulkan.Extensions.KHR; |
|
|
|
|
|
using SilkNetDemo; |
|
|
|
|
|
|
|
|
|
|
|
namespace GpuInterop.VulkanDemo; |
|
|
namespace GpuInterop.VulkanDemo; |
|
|
|
|
|
|
|
|
public class VulkanDemoControl : DrawingSurfaceDemoBase |
|
|
public class VulkanDemoControl : DrawingSurfaceDemoBase |
|
|
{ |
|
|
{ |
|
|
private Instance _vkInstance; |
|
|
|
|
|
private Vk _api; |
|
|
|
|
|
|
|
|
|
|
|
class VulkanResources : IAsyncDisposable |
|
|
class VulkanResources : IAsyncDisposable |
|
|
{ |
|
|
{ |
|
|
public VulkanContext Context { get; } |
|
|
public VulkanContext Context { get; } |
|
|
|
|
|
@ -1,10 +1,6 @@ |
|
|
using System; |
|
|
|
|
|
using System.Collections.Generic; |
|
|
|
|
|
using System.Threading.Tasks; |
|
|
|
|
|
|
|
|
|
|
|
namespace Avalonia.Platform; |
|
|
namespace Avalonia.Platform; |
|
|
|
|
|
|
|
|
public struct PlatformGraphicsExternalImageProperties |
|
|
public record struct PlatformGraphicsExternalImageProperties |
|
|
{ |
|
|
{ |
|
|
public int Width { get; set; } |
|
|
public int Width { get; set; } |
|
|
public int Height { get; set; } |
|
|
public int Height { get; set; } |
|
|
|
|
|
@ -15,7 +15,6 @@ namespace Avalonia.Controls.Presenters |
|
|
public class ScrollContentPresenter : ContentPresenter, IPresenter, IScrollable, IScrollAnchorProvider |
|
|
public class ScrollContentPresenter : ContentPresenter, IPresenter, IScrollable, IScrollAnchorProvider |
|
|
{ |
|
|
{ |
|
|
private const double EdgeDetectionTolerance = 0.1; |
|
|
private const double EdgeDetectionTolerance = 0.1; |
|
|
private const int ProximityPoints = 10; |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
/// <summary>
|
|
|
/// Defines the <see cref="CanHorizontallyScroll"/> property.
|
|
|
/// Defines the <see cref="CanHorizontallyScroll"/> property.
|
|
|
|
|
|
@ -264,7 +264,7 @@ namespace Avalonia.IntegrationTests.Appium |
|
|
var secondaryWindow = GetWindow("SecondaryWindow"); |
|
|
var secondaryWindow = GetWindow("SecondaryWindow"); |
|
|
var (_, miniaturizeButton, _) = secondaryWindow.GetChromeButtons(); |
|
|
var (_, miniaturizeButton, _) = secondaryWindow.GetChromeButtons(); |
|
|
|
|
|
|
|
|
Assert.Equal(false, miniaturizeButton.Enabled); |
|
|
Assert.False(miniaturizeButton.Enabled); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|