Merge pull request #840 from imerr/master

[WPF] Only take border size into account when decorated
mono · Dec 12, 2018 · cafb671 · cafb671
2 parents 1ed5da5 + 490b7e6
commit cafb671
Showing 1 changed file with 10 additions and 11 deletions.
diff --git 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;
 			}