From b33d8a3a8de89b74ac8fbcaa67efcdfaa7d092c3 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 16 Jan 2019 21:24:01 +0000 Subject: [PATCH] [X11] Various fixes --- src/Avalonia.X11/X11Window.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs index e6871ce266..710951fcab 100644 --- a/src/Avalonia.X11/X11Window.cs +++ b/src/Avalonia.X11/X11Window.cs @@ -186,8 +186,9 @@ namespace Avalonia.X11 if (preResize.HasValue) { - max = new PixelSize(Math.Max(_realSize.Width, max.Width), Math.Max(_realSize.Height, max.Height)); - min = new PixelSize(Math.Min(_realSize.Width, min.Width), Math.Min(_realSize.Height, min.Height)); + var desired = preResize.Value; + max = new PixelSize(Math.Max(desired.Width, max.Width), Math.Max(desired.Height, max.Height)); + min = new PixelSize(Math.Min(desired.Width, min.Width), Math.Min(desired.Height, min.Height)); } var hints = new XSizeHints @@ -324,11 +325,10 @@ namespace Avalonia.X11 else { XTranslateCoordinates(_x11.Display, _handle, _x11.RootWindow, - _configure.Value.x, _configure.Value.y, + 0, 0, out var tx, out var ty, out _); _configurePoint = new Point(tx, ty); } - if (needEnqueue) Dispatcher.UIThread.Post(() => { @@ -840,6 +840,7 @@ namespace Avalonia.X11 (int)(maxSize.Height > maxDim ? maxDim : Math.Max(min.Height, minSize.Height * Scaling))); _minMaxSize = (min, max); + UpdateSizeHints(null); } public void SetTopmost(bool value)