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

Fixed clipped borders on scaled-to-fit images, and fixed a floating image layout bug.

Browse Source
This commit is contained in:
JulianSmart
2015-05-26 11:47:54 +01:00
parent 0ed1e641d2
commit ab4b7674c0
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/richtext/richtextbuffer.cpp
View File

@@ -2170,8 +2170,10 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, wxRichTextDrawingContext& co
if (wxRichTextBuffer::GetFloatingLayoutMode() && GetFloatCollector() && GetFloatCollector()->HasFloats()) if (wxRichTextBuffer::GetFloatingLayoutMode() && GetFloatCollector() && GetFloatCollector()->HasFloats())
{ {
int bottom = GetFloatCollector()->GetLastRectBottom(); int bottom = GetFloatCollector()->GetLastRectBottom();
if (bottom > maxHeight) // The floating objects are positioned relative to entire buffer, not this box
maxHeight = bottom; int maxFloatHeight = GetFloatCollector()->GetLastRectBottom() - GetPosition().y - topMargin;
if (maxFloatHeight > maxHeight)
maxHeight = maxFloatHeight;
} }
if (attr.GetTextBoxAttr().GetSize().GetWidth().IsValid()) if (attr.GetTextBoxAttr().GetSize().GetWidth().IsValid())
@@ -12063,14 +12065,22 @@ bool wxRichTextImage::LoadImageCache(wxDC& dc, bool resetCache, const wxSize& pa
sz = contentRect.GetSize(); sz = contentRect.GetSize();
} }
// Take away space used by the image's margins
{
// Find the actual space available when margin is taken into account
wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
marginRect = wxRect(0, 0, 100, 100); // To force GetBoxRects to return content rect
GetBoxRects(dc, buffer, GetAttributes(), marginRect, borderRect, contentRect, paddingRect, outlineRect);
sz += (contentRect.GetSize() - wxSize(100, 100));
}
// Use a minimum size to stop images becoming very small // Use a minimum size to stop images becoming very small
parentWidth = wxMax(100, sz.GetWidth()); parentWidth = wxMax(100, sz.GetWidth());
parentHeight = wxMax(100, sz.GetHeight()); parentHeight = wxMax(100, sz.GetHeight());
if (buffer->GetRichTextCtrl()) // Start with a maximum width of the control size, even if not specified by the content,
// Start with a maximum width of the control size, even if not specified by the content, // to minimize the amount of picture overlapping the right-hand side
// to minimize the amount of picture overlapping the right-hand side maxWidth = parentWidth;
maxWidth = parentWidth;
} }
} }