From ebdb66048de9a0eba8ed959bd6ff1a54c3286d24 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 22 Jun 2019 00:00:55 +0300 Subject: [PATCH] Fixed fbdev --- src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs | 5 ++++- src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebuffer.cs | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs b/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs index 43beb923e5..83d1c4aae3 100644 --- a/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs +++ b/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs @@ -45,7 +45,10 @@ namespace Avalonia.Controls.Embedding { if (EnforceClientSize) availableSize = PlatformImpl?.ClientSize ?? default(Size); - return base.MeasureOverride(availableSize); + var rv = base.MeasureOverride(availableSize); + if (EnforceClientSize) + return availableSize; + return rv; } private readonly NameScope _nameScope = new NameScope(); diff --git a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebuffer.cs b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebuffer.cs index 87b55be488..1e25bd4a8a 100644 --- a/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebuffer.cs +++ b/src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebuffer.cs @@ -43,12 +43,10 @@ namespace Avalonia.LinuxFramebuffer SetBpp(); - _varInfo.yoffset = 100; if (-1 == NativeUnsafeMethods.ioctl(_fd, FbIoCtl.FBIOPUT_VSCREENINFO, pnfo)) _varInfo.transp = new fb_bitfield(); - if (-1 == NativeUnsafeMethods.ioctl(_fd, FbIoCtl.FBIOPUT_VSCREENINFO, pnfo)) - throw new Exception("FBIOPUT_VSCREENINFO error: " + Marshal.GetLastWin32Error()); + NativeUnsafeMethods.ioctl(_fd, FbIoCtl.FBIOPUT_VSCREENINFO, pnfo); if (-1 == NativeUnsafeMethods.ioctl(_fd, FbIoCtl.FBIOGET_VSCREENINFO, pnfo)) throw new Exception("FBIOGET_VSCREENINFO error: " + Marshal.GetLastWin32Error());