From a0761842f13ebca698fff0fb97975ef4087caaa9 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 14 Dec 2013 15:33:15 +0000 Subject: [PATCH] Ensure a small spanned column doesn't shrink its columns too much by checking for min column sizes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 5a30ce3b54..5a1e386291 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -10219,8 +10219,12 @@ bool wxRichTextTable::Layout(wxDC& dc, wxRichTextDrawingContext& context, const int stretchColCount = 0; for (k = i; k < (i+spans); k++) { + int minColWidth = wxMax(minColWidths[k], minColWidthsNoWrap[k]); + if (colWidths[k] > 0) // absolute or proportional width has been specified spanningWidthLeft -= colWidths[k]; + else if (minColWidth > 0) + spanningWidthLeft -= minColWidth; else stretchColCount ++; } @@ -10237,7 +10241,8 @@ bool wxRichTextTable::Layout(wxDC& dc, wxRichTextDrawingContext& context, const { for (k = i; k < (i+spans); k++) { - if (colWidths[k] <= 0) // absolute or proportional width has not been specified + int minColWidth = wxMax(minColWidths[k], minColWidthsNoWrap[k]); + if (colWidths[k] <= 0 && minColWidth <= 0) // absolute or proportional width has not been specified { int newWidth = colShare; if (k == (i+spans-1))