From 490b7e614fe0664e6e75c645a4be61e1b5e98fd2 Mon Sep 17 00:00:00 2001 From: Robin Rolf Date: Fri, 6 Jul 2018 21:49:30 +0200 Subject: [PATCH] Only take border size into account when decorated --- Xwt.WPF/Xwt.WPFBackend/WindowFrameBackend.cs | 21 ++++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Xwt.WPF/Xwt.WPFBackend/WindowFrameBackend.cs b/Xwt.WPF/Xwt.WPFBackend/WindowFrameBackend.cs index 22755f923..dd18cacb8 100644 --- a/Xwt.WPF/Xwt.WPFBackend/WindowFrameBackend.cs +++ b/Xwt.WPF/Xwt.WPFBackend/WindowFrameBackend.cs @@ -407,13 +407,12 @@ protected Rectangle ToNonClientRect (Rectangle rect) var size = rect.Size; var loc = rect.Location; - var border = GetBorderSize (); - size.Height += border.Height * 2; - size.Width += border.Width * 2; - loc.X -= border.Width; - loc.Y -= border.Height; - if (((IWindowFrameBackend)this).Decorated) { + var border = GetBorderSize (); + size.Height += border.Height * 2; + size.Width += border.Width * 2; + loc.X -= border.Width; + loc.Y -= border.Height; size.Height += SystemParameters.WindowCaptionHeight; loc.Y -= SystemParameters.WindowCaptionHeight; } @@ -430,13 +429,13 @@ protected Rectangle ToClientRect (Rectangle rect) var size = rect.Size; var loc = rect.Location; - var border = GetBorderSize (); - size.Height -= border.Height * 2; - size.Width -= border.Width * 2; - loc.X += border.Width; - loc.Y += border.Height; if (((IWindowFrameBackend)this).Decorated) { + var border = GetBorderSize (); + size.Height -= border.Height * 2; + size.Width -= border.Width * 2; + loc.X += border.Width; + loc.Y += border.Height; size.Height -= SystemParameters.WindowCaptionHeight; loc.Y += SystemParameters.WindowCaptionHeight; }