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

Fixed print preview glitch and vertical cell alignment.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-10-31 09:40:30 +00:00
parent 2a7f5127e9
commit 4618ed5f0b
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/richtext/richtextbuffer.cpp
View File

@@ -1953,10 +1953,17 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, wxRichTextDrawingContext& co
availableSpace = GetAvailableContentArea(dc, context, rect); availableSpace = GetAvailableContentArea(dc, context, rect);
} }
// Fix the width if we're at the top level // Fix the width if we're at the top level or if we're asked to
if (!GetParent()) if (!GetParent() || (style & wxRICHTEXT_FIXED_WIDTH))
attr.GetTextBoxAttr().GetWidth().SetValue(rect.GetWidth(), wxTEXT_ATTR_UNITS_PIXELS); attr.GetTextBoxAttr().GetWidth().SetValue(rect.GetWidth(), wxTEXT_ATTR_UNITS_PIXELS);
// Fix the height to the passed rect height if we're asked to
if (style & wxRICHTEXT_FIXED_HEIGHT)
attr.GetTextBoxAttr().GetHeight().SetValue(rect.GetHeight(), wxTEXT_ATTR_UNITS_PIXELS);
// Don't pass fixed width/height styles to children
style &= ~(wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_FIXED_HEIGHT);
int leftMargin, rightMargin, topMargin, bottomMargin; int leftMargin, rightMargin, topMargin, bottomMargin;
wxRichTextObject::GetTotalMargin(dc, GetBuffer(), attr, leftMargin, rightMargin, wxRichTextObject::GetTotalMargin(dc, GetBuffer(), attr, leftMargin, rightMargin,
topMargin, bottomMargin); topMargin, bottomMargin);
@@ -2109,11 +2116,14 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, wxRichTextDrawingContext& co
node = node->GetNext(); node = node->GetNext();
} }
int maxContentHeight = 0;
node = m_children.GetLast(); node = m_children.GetLast();
if (node && node->GetData()->IsShown()) if (node && node->GetData()->IsShown())
{ {
wxRichTextObject* child = node->GetData(); wxRichTextObject* child = node->GetData();
maxHeight = child->GetPosition().y - (GetPosition().y + topMargin) + child->GetCachedSize().y; maxHeight = child->GetPosition().y - (GetPosition().y + topMargin) + child->GetCachedSize().y;
maxContentHeight = maxHeight;
} }
else else
maxHeight = 0; // topMargin + bottomMargin; maxHeight = 0; // topMargin + bottomMargin;
@@ -2181,7 +2191,7 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, wxRichTextDrawingContext& co
(attr.GetTextBoxAttr().GetVerticalAlignment() > wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_TOP)) (attr.GetTextBoxAttr().GetVerticalAlignment() > wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_TOP))
{ {
int yOffset = 0; int yOffset = 0;
int leftOverSpace = availableSpace.height - topMargin - bottomMargin - maxHeight; int leftOverSpace = GetCachedSize().y - topMargin - bottomMargin - maxContentHeight;
if (leftOverSpace > 0) if (leftOverSpace > 0)
{ {
if (attr.GetTextBoxAttr().GetVerticalAlignment() == wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_CENTRE) if (attr.GetTextBoxAttr().GetVerticalAlignment() == wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_CENTRE)
@@ -9748,10 +9758,9 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
wxSize newSize = wxSize(cell->GetCachedSize().GetWidth(), availableHeight); wxSize newSize = wxSize(cell->GetCachedSize().GetWidth(), availableHeight);
wxRect availableCellSpace = wxRect(cell->GetPosition(), newSize); wxRect availableCellSpace = wxRect(cell->GetPosition(), newSize);
cell->Invalidate(wxRICHTEXT_ALL); cell->Invalidate(wxRICHTEXT_ALL);
cell->Layout(dc, context, availableCellSpace, availableSpace, style); cell->Layout(dc, context, availableCellSpace, availableSpace, style|wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_FIXED_HEIGHT);
// Ensure there's room in the span to display its contents, else it'll overwrite lower rows // Ensure there's room in the span to display its contents, else it'll overwrite lower rows
int overhang = cell->GetCachedSize().GetHeight() - availableHeight; int overhang = cell->GetCachedSize().GetHeight() - availableHeight;
cell->SetCachedSize(newSize);
if (overhang > 0) if (overhang > 0)
{ {
@@ -9801,8 +9810,7 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
wxRect availableCellSpace = wxRect(position, size); wxRect availableCellSpace = wxRect(position, size);
cell->Invalidate(wxRICHTEXT_ALL); cell->Invalidate(wxRICHTEXT_ALL);
cell->Layout(dc, context, availableCellSpace, availableSpace, style); cell->Layout(dc, context, availableCellSpace, availableSpace, style|wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_FIXED_HEIGHT);
cell->SetCachedSize(size);
} }
} }
@@ -10425,11 +10433,7 @@ bool wxRichTextTable::Layout(wxDC& dc, wxRichTextDrawingContext& context, const
wxRect availableCellSpace = wxRect(cell->GetPosition(), wxSize(actualWidths[i], maxCellHeight)); wxRect availableCellSpace = wxRect(cell->GetPosition(), wxSize(actualWidths[i], maxCellHeight));
// Lay out cell with new height // Lay out cell with new height
cell->Invalidate(wxRICHTEXT_ALL); cell->Invalidate(wxRICHTEXT_ALL);
cell->Layout(dc, context, availableCellSpace, availableSpace, style); cell->Layout(dc, context, availableCellSpace, availableSpace, style||wxRICHTEXT_FIXED_HEIGHT|wxRICHTEXT_FIXED_WIDTH);
// Make sure the cell size really is the appropriate size,
// not the calculated box size
cell->SetCachedSize(wxSize(actualWidths[i], maxCellHeight));
maxRight = wxMax(maxRight, cell->GetPosition().x + cell->GetCachedSize().x); maxRight = wxMax(maxRight, cell->GetPosition().x + cell->GetCachedSize().x);
} }
@@ -13613,7 +13617,7 @@ int wxTextAttrDimensionConverter::GetPixels(const wxTextAttrDimension& dim, int
} }
// Scaling is used in e.g. printing // Scaling is used in e.g. printing
if (m_scale != 1.0) if (m_scale != 1.0 && dim.GetUnits() != wxTEXT_ATTR_UNITS_PIXELS && dim.GetUnits() != wxTEXT_ATTR_UNITS_PERCENTAGE)
pixelsDouble /= m_scale; pixelsDouble /= m_scale;
int pixelsInt = int(pixelsDouble + 0.5); int pixelsInt = int(pixelsDouble + 0.5);