MaxWidth/MaxHeight taking into account before rendering. Fixes #45

ConsoleFramework/Controls/Control.cs

@@ -860,7 +860,7 @@ private struct MinMax
 
         private Rect calculateLayoutClip() {
             Vector offset = computeAlignmentOffset();
-            Size clientSize = getClientSize();
+            Size clientSize = getClippedClientSize();
             return new Rect(-offset.X, -offset.Y, clientSize.Width, clientSize.Height);
         }
 
@@ -908,6 +908,23 @@ private struct MinMax
                             Math.Max(0, renderSlotRect.Height - marginHeight));
         }
 
+        /// <summary>
+        /// This method returns the size of layout slot computed with Max-constraints and
+        /// decreased by margins. This is the final size of layout slot that will be written
+        /// to layoutClipInfo.
+        /// </summary>
+        private Size getClippedClientSize() {
+            Thickness margin = Margin;
+            int marginWidth = margin.Left + margin.Right;
+            int marginHeight = margin.Top + margin.Bottom;
+
+            Rect renderSlotRect = RenderSlotRect;
+
+            // Take MaxWidth/MaxHeight into account when before applying margins
+            return new Size(Math.Max(0, Math.Min(renderSlotRect.Width, MaxWidth) - marginWidth),
+                Math.Max(0, Math.Min(renderSlotRect.Height, MaxHeight) - marginHeight));
+        }
+
         private Vector computeAlignmentOffsetCore(Size clientSize, Size inkSize) {
             Vector offset = new Vector();