Browse Source

Fixed fbdev

pre-lifetime-fixes
Nikita Tsukanov 7 years ago
parent
commit
ebdb66048d
  1. 5
      src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs
  2. 4
      src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebuffer.cs

5
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();

4
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());

Loading…
Cancel
Save