From 4ee07b73554d0aec44f789e924e2ebabc920a88a Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Mon, 29 Oct 2018 15:35:33 +0000 Subject: [PATCH] fixes/2042-opengl-using-pixelsize-struct --- src/Avalonia.OpenGL/EglGlPlatformSurface.cs | 5 ++--- src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs | 5 ++--- src/Skia/Avalonia.Skia/GlRenderTarget.cs | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Avalonia.OpenGL/EglGlPlatformSurface.cs b/src/Avalonia.OpenGL/EglGlPlatformSurface.cs index 19894e4ec5..c99c869c4f 100644 --- a/src/Avalonia.OpenGL/EglGlPlatformSurface.cs +++ b/src/Avalonia.OpenGL/EglGlPlatformSurface.cs @@ -7,8 +7,7 @@ namespace Avalonia.OpenGL public interface IEglWindowGlPlatformSurfaceInfo { IntPtr Handle { get; } - // TODO: Change to PixelSize struct once https://github.com/AvaloniaUI/Avalonia/pull/1889 is merged - System.Drawing.Size PixelSize { get; } + PixelSize Size { get; } double Scaling { get; } } @@ -71,7 +70,7 @@ namespace Avalonia.OpenGL } public IGlDisplay Display => _context.Display; - public System.Drawing.Size PixelSize => _info.PixelSize; + public PixelSize Size => _info.Size; public double Scaling => _info.Scaling; } } diff --git a/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs b/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs index 22641d7b53..4b0de05b77 100644 --- a/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs +++ b/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs @@ -5,8 +5,7 @@ namespace Avalonia.OpenGL public interface IGlPlatformSurfaceRenderingSession : IDisposable { IGlDisplay Display { get; } - // TODO: Change to PixelSize struct once https://github.com/AvaloniaUI/Avalonia/pull/1889 is merged - System.Drawing.Size PixelSize { get; } + PixelSize Size { get; } double Scaling { get; } } -} \ No newline at end of file +} diff --git a/src/Skia/Avalonia.Skia/GlRenderTarget.cs b/src/Skia/Avalonia.Skia/GlRenderTarget.cs index 0435e1060a..a6269473a6 100644 --- a/src/Skia/Avalonia.Skia/GlRenderTarget.cs +++ b/src/Skia/Avalonia.Skia/GlRenderTarget.cs @@ -28,7 +28,7 @@ namespace Avalonia.Skia var gl = disp.GlInterface; gl.GetIntegerv(GL_FRAMEBUFFER_BINDING, out var fb); - var size = session.PixelSize; + var size = session.Size; var scaling = session.Scaling; GRBackendRenderTargetDesc desc = new GRBackendRenderTargetDesc