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

Applied #15393 (dghart) fixing wxRichTextTable for percentage widths

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-08-09 11:56:33 +00:00
parent fd51987ff0
commit fc63fb9aaf
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/richtext/richtextbuffer.cpp
View File

@@ -9520,12 +9520,13 @@ bool wxRichTextTable::Layout(wxDC& dc, wxRichTextDrawingContext& context, const
wxRichTextAttr attr(GetAttributes()); wxRichTextAttr attr(GetAttributes());
context.ApplyVirtualAttributes(attr, this); context.ApplyVirtualAttributes(attr, this);
bool tableHasPercentWidth = (attr.GetTextBoxAttr().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_PERCENTAGE);
// If we have no fixed table size, and assuming we're not pushed for // If we have no fixed table size, and assuming we're not pushed for
// space, then we don't have to try to stretch the table to fit the contents. // space, then we don't have to try to stretch the table to fit the contents.
bool stretchToFitTableWidth = false; bool stretchToFitTableWidth = tableHasPercentWidth;
int tableWidth = rect.width; int tableWidth = rect.width;
if (attr.GetTextBoxAttr().GetWidth().IsValid()) if (attr.GetTextBoxAttr().GetWidth().IsValid() && !tableHasPercentWidth)
{ {
tableWidth = converter.GetPixels(attr.GetTextBoxAttr().GetWidth()); tableWidth = converter.GetPixels(attr.GetTextBoxAttr().GetWidth());