Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure a small spanned column doesn't shrink its columns too much by checking for min column sizes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-12-14 15:32:58 +00:00
parent 1638715b72
commit 6adf2efa20
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/richtext/richtextbuffer.cpp
View File

@@ -10283,13 +10283,16 @@ bool wxRichTextTable::Layout(wxDC& dc, wxRichTextDrawingContext& context, const
if (spanningWidth > 0) if (spanningWidth > 0)
{ {
// Now share the spanning width between columns within that span // Now share the spanning width between columns within that span
// TODO: take into account min widths of columns within the span
int spanningWidthLeft = spanningWidth; int spanningWidthLeft = spanningWidth;
int stretchColCount = 0; int stretchColCount = 0;
for (k = i; k < (i+spans); k++) 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 if (colWidths[k] > 0) // absolute or proportional width has been specified
spanningWidthLeft -= colWidths[k]; spanningWidthLeft -= colWidths[k];
else if (minColWidth > 0)
spanningWidthLeft -= minColWidth;
else else
stretchColCount ++; stretchColCount ++;
} }
@@ -10306,7 +10309,8 @@ bool wxRichTextTable::Layout(wxDC& dc, wxRichTextDrawingContext& context, const
{ {
for (k = i; k < (i+spans); k++) 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; int newWidth = colShare;
if (k == (i+spans-1)) if (k == (i+spans-1))