From 44e6825c37220ff35969886760b3b1dcbb1580a2 Mon Sep 17 00:00:00 2001 From: batzen Date: Wed, 26 Aug 2015 12:57:25 +0200 Subject: [PATCH] Fixes #161 by respecting MaxWidth and MaxHeight of Window --- Fluent/Internal/WindowSizing.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Fluent/Internal/WindowSizing.cs b/Fluent/Internal/WindowSizing.cs index 469ebf9b1..8ad0cd374 100644 --- a/Fluent/Internal/WindowSizing.cs +++ b/Fluent/Internal/WindowSizing.cs @@ -182,8 +182,11 @@ private MINMAXINFO GetMinMaxInfo(IntPtr hwnd, MINMAXINFO mmi) var x = ignoreTaskBar ? monitorInfo.rcMonitor.left : monitorInfo.rcWork.left; var y = ignoreTaskBar ? monitorInfo.rcMonitor.top : monitorInfo.rcWork.top; - mmi.ptMaxSize.X = ignoreTaskBar ? Math.Abs(monitorInfo.rcMonitor.right - x) : Math.Abs(monitorInfo.rcWork.right - x); - mmi.ptMaxSize.Y = ignoreTaskBar ? Math.Abs(monitorInfo.rcMonitor.bottom - y) : Math.Abs(monitorInfo.rcWork.bottom - y); + var maxWidth = ignoreTaskBar ? Math.Abs(monitorInfo.rcMonitor.right - x) : Math.Abs(monitorInfo.rcWork.right - x); + var maxHeight = ignoreTaskBar ? Math.Abs(monitorInfo.rcMonitor.bottom - y) : Math.Abs(monitorInfo.rcWork.bottom - y); + + mmi.ptMaxSize.X = Math.Min(maxWidth, (int)this.window.MaxWidth); + mmi.ptMaxSize.Y = Math.Min(maxHeight, (int)this.window.MaxHeight); if (!ignoreTaskBar) {