X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/109bfc88a4a8583cc2fd5ca3fa6dbd74f5c7274c..2bc44d6257f74b7f815d4a44014717b21dc20fd5:/src/richtext/richtextbuffer.cpp diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 7890fe7b42..aae4eaa579 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -589,7 +589,7 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range, // Skip } else - child->Draw(dc, range, selectionRange, childRect, descent, style); + child->Draw(dc, range, selectionRange, rect, descent, style); } node = node->GetNext(); @@ -857,25 +857,29 @@ wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineAtPosition(long pos, bool c wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); while (node) { - // child is a paragraph - wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph); - wxASSERT (child != NULL); - - wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); - while (node2) + wxRichTextObject* obj = (wxRichTextObject*) node->GetData(); + if (obj->GetRange().Contains(pos)) { - wxRichTextLine* line = node2->GetData(); + // child is a paragraph + wxRichTextParagraph* child = wxDynamicCast(obj, wxRichTextParagraph); + wxASSERT (child != NULL); + + wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); + while (node2) + { + wxRichTextLine* line = node2->GetData(); - wxRichTextRange range = line->GetAbsoluteRange(); + wxRichTextRange range = line->GetAbsoluteRange(); - if (range.Contains(pos) || + if (range.Contains(pos) || - // If the position is end-of-paragraph, then return the last line of - // of the paragraph. - (range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd())) - return line; + // If the position is end-of-paragraph, then return the last line of + // of the paragraph. + (range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd())) + return line; - node2 = node2->GetNext(); + node2 = node2->GetNext(); + } } node = node->GetNext(); @@ -3105,7 +3109,7 @@ wxRichTextParagraph::~wxRichTextParagraph() } /// Draw the item -bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int WXUNUSED(descent), int style) +bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int WXUNUSED(descent), int style) { wxTextAttr attr = GetCombinedAttributes(); @@ -3184,52 +3188,56 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxR wxRichTextLine* line = node->GetData(); wxRichTextRange lineRange = line->GetAbsoluteRange(); - int maxDescent = line->GetDescent(); - // Lines are specified relative to the paragraph wxPoint linePosition = line->GetPosition() + GetPosition(); - wxPoint objectPosition = linePosition; - - // Loop through objects until we get to the one within range - wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst(); - int i = 0; - while (node2) + // Don't draw if off the screen + if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) != 0) || ((linePosition.y + line->GetSize().y) >= rect.y && linePosition.y <= rect.y + rect.height)) { - wxRichTextObject* child = node2->GetData(); + wxPoint objectPosition = linePosition; + int maxDescent = line->GetDescent(); - if (!child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range)) + // Loop through objects until we get to the one within range + wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst(); + + int i = 0; + while (node2) { - // Draw this part of the line at the correct position - wxRichTextRange objectRange(child->GetRange()); - objectRange.LimitTo(lineRange); + wxRichTextObject* child = node2->GetData(); - wxSize objectSize; -#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING && wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS - if (i < (int) line->GetObjectSizes().GetCount()) + if (child->GetRange().GetLength() > 0 && !child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range)) { - objectSize.x = line->GetObjectSizes()[(size_t) i]; - } - else + // Draw this part of the line at the correct position + wxRichTextRange objectRange(child->GetRange()); + objectRange.LimitTo(lineRange); + + wxSize objectSize; +#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING && wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + if (i < (int) line->GetObjectSizes().GetCount()) + { + objectSize.x = line->GetObjectSizes()[(size_t) i]; + } + else #endif - { - int descent = 0; - child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED, objectPosition); - } + { + int descent = 0; + child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED, objectPosition); + } - // Use the child object's width, but the whole line's height - wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y)); - child->Draw(dc, objectRange, selectionRange, childRect, maxDescent, style); + // Use the child object's width, but the whole line's height + wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y)); + child->Draw(dc, objectRange, selectionRange, childRect, maxDescent, style); - objectPosition.x += objectSize.x; - i ++; - } - else if (child->GetRange().GetStart() > lineRange.GetEnd()) - // Can break out of inner loop now since we've passed this line's range - break; + objectPosition.x += objectSize.x; + i ++; + } + else if (child->GetRange().GetStart() > lineRange.GetEnd()) + // Can break out of inner loop now since we've passed this line's range + break; - node2 = node2->GetNext(); + node2 = node2->GetNext(); + } } node = node->GetNext(); @@ -3238,6 +3246,25 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxR return true; } +// Get the range width using partial extents calculated for the whole paragraph. +static int wxRichTextGetRangeWidth(const wxRichTextParagraph& para, const wxRichTextRange& range, const wxArrayInt& partialExtents) +{ + wxASSERT(partialExtents.GetCount() >= (size_t) range.GetLength()); + + if (partialExtents.GetCount() < (size_t) range.GetLength()) + return 0; + + int leftMostPos = 0; + if (range.GetStart() - para.GetRange().GetStart() > 0) + leftMostPos = partialExtents[range.GetStart() - para.GetRange().GetStart() - 1]; + + int rightMostPos = partialExtents[range.GetEnd() - para.GetRange().GetStart()]; + + int w = rightMostPos - leftMostPos; + + return w; +} + /// Lay the item out bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) { @@ -3329,6 +3356,12 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) { wxRichTextObject* child = node->GetData(); + if (child->GetRange().GetLength() == 0) + { + node = node->GetNext(); + continue; + } + // If this is e.g. a composite text box, it will need to be laid out itself. // But if just a text fragment or image, for example, this will // do nothing. NB: won't we need to set the position after layout? @@ -3361,7 +3394,15 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) childDescent = child->GetDescent(); } else + { +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + // Get height only, then the width using the partial extents + GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY); + childSize.x = wxRichTextGetRangeWidth(*this, wxRichTextRange(lastEndPos+1, lastPosToUse), partialExtents); +#else GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED, rect.GetPosition()); +#endif + } // Cases: // 1) There was a line break BEFORE the natural break @@ -3390,7 +3431,15 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) // Let's find the actual size of the current line now wxSize actualSize; wxRichTextRange actualRange(lastCompletedEndPos+1, wrapPosition); + +#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS + // Get height only, then the width using the partial extents + GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY); + actualSize.x = wxRichTextGetRangeWidth(*this, actualRange, partialExtents); +#else GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED); +#endif + currentWidth = actualSize.x; lineHeight = wxMax(lineHeight, actualSize.y); maxDescent = wxMax(childDescent, maxDescent); @@ -3502,7 +3551,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) { wxRichTextObject* child = node2->GetData(); - if (!child->GetRange().IsOutside(lineRange)) + if (child->GetRange().GetLength() > 0 && !child->GetRange().IsOutside(lineRange)) { wxRichTextRange rangeToUse = lineRange; rangeToUse.LimitTo(child->GetRange()); @@ -3676,7 +3725,18 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz rangeToUse.LimitTo(child->GetRange()); int childDescent = 0; - if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y), p)) + // At present wxRICHTEXT_HEIGHT_ONLY is only fast if we're already cached the size, + // but it's only going to be used after caching has taken place. + if ((flags & wxRICHTEXT_HEIGHT_ONLY) && child->GetCachedSize().y != 0) + { + childDescent = child->GetDescent(); + childSize = child->GetCachedSize(); + + sz.y = wxMax(sz.y, childSize.y); + sz.x += childSize.x; + descent = wxMax(descent, childDescent); + } + else if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y), p)) { sz.y = wxMax(sz.y, childSize.y); sz.x += childSize.x; @@ -5164,6 +5224,15 @@ bool wxRichTextBuffer::InsertParagraphsWithUndo(long pos, const wxRichTextParagr action->GetNewParagraphs() = paragraphs; + if (p && !p->IsDefault()) + { + for (wxRichTextObjectList::compatibility_iterator node = action->GetNewParagraphs().GetChildren().GetFirst(); node; node = node->GetNext()) + { + wxRichTextObject* child = node->GetData(); + child->SetAttributes(*p); + } + } + action->SetPosition(pos); wxRichTextRange range = wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1); @@ -5505,8 +5574,6 @@ bool wxRichTextBuffer::BeginStyle(const wxTextAttr& style) SetDefaultStyle(newStyle); - // wxLogDebug("Default style size = %d", GetDefaultStyle().GetFont().GetPointSize()); - return true; } @@ -5786,7 +5853,8 @@ bool wxRichTextBuffer::RemoveHandler(const wxString& name) } /// Finds a handler by filename or, if supplied, type -wxRichTextFileHandler *wxRichTextBuffer::FindHandlerFilenameOrType(const wxString& filename, int imageType) +wxRichTextFileHandler *wxRichTextBuffer::FindHandlerFilenameOrType(const wxString& filename, + wxRichTextFileType imageType) { if (imageType != wxRICHTEXT_TYPE_ANY) return FindHandler(imageType); @@ -5816,7 +5884,7 @@ wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& name) } /// Finds a handler by extension and type -wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, int type) +wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, wxRichTextFileType type) { wxList::compatibility_iterator node = sm_handlers.GetFirst(); while (node) @@ -5831,7 +5899,7 @@ wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, } /// Finds a handler by type -wxRichTextFileHandler* wxRichTextBuffer::FindHandler(int type) +wxRichTextFileHandler* wxRichTextBuffer::FindHandler(wxRichTextFileType type) { wxList::compatibility_iterator node = sm_handlers.GetFirst(); while (node) @@ -5909,7 +5977,7 @@ wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save, wxArrayInt* t } /// Load a file -bool wxRichTextBuffer::LoadFile(const wxString& filename, int type) +bool wxRichTextBuffer::LoadFile(const wxString& filename, wxRichTextFileType type) { wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type); if (handler) @@ -5925,7 +5993,7 @@ bool wxRichTextBuffer::LoadFile(const wxString& filename, int type) } /// Save a file -bool wxRichTextBuffer::SaveFile(const wxString& filename, int type) +bool wxRichTextBuffer::SaveFile(const wxString& filename, wxRichTextFileType type) { wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type); if (handler) @@ -5938,7 +6006,7 @@ bool wxRichTextBuffer::SaveFile(const wxString& filename, int type) } /// Load from a stream -bool wxRichTextBuffer::LoadFile(wxInputStream& stream, int type) +bool wxRichTextBuffer::LoadFile(wxInputStream& stream, wxRichTextFileType type) { wxRichTextFileHandler* handler = FindHandler(type); if (handler) @@ -5954,7 +6022,7 @@ bool wxRichTextBuffer::LoadFile(wxInputStream& stream, int type) } /// Save to a stream -bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, int type) +bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, wxRichTextFileType type) { wxRichTextFileHandler* handler = FindHandler(type); if (handler) @@ -6028,7 +6096,7 @@ bool wxRichTextBuffer::PasteFromClipboard(long position) wxRichTextBuffer* richTextBuffer = data.GetRichTextBuffer(); if (richTextBuffer) { - InsertParagraphsWithUndo(position+1, *richTextBuffer, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + InsertParagraphsWithUndo(position+1, *richTextBuffer, GetRichTextCtrl(), 0); if (GetRichTextCtrl()) GetRichTextCtrl()->ShowPosition(position + richTextBuffer->GetRange().GetEnd()); delete richTextBuffer; @@ -6052,7 +6120,7 @@ bool wxRichTextBuffer::PasteFromClipboard(long position) #else wxString text2 = text; #endif - InsertTextWithUndo(position+1, text2, GetRichTextCtrl()); + InsertTextWithUndo(position+1, text2, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); if (GetRichTextCtrl()) GetRichTextCtrl()->ShowPosition(position + text2.Length()); @@ -6475,6 +6543,58 @@ wxRichTextAction::~wxRichTextAction() { } +void wxRichTextAction::CalculateRefreshOptimizations(wxArrayInt& optimizationLineCharPositions, wxArrayInt& optimizationLineYPositions) +{ + // Store a list of line start character and y positions so we can figure out which area + // we need to refresh + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + // NOTE: we're assuming that the buffer is laid out correctly at this point. + // If we had several actions, which only invalidate and leave layout until the + // paint handler is called, then this might not be true. So we may need to switch + // optimisation on only when we're simply adding text and not simultaneously + // deleting a selection, for example. Or, we make sure the buffer is laid out correctly + // first, but of course this means we'll be doing it twice. + if (!m_buffer->GetDirty() && m_ctrl) // can only do optimisation if the buffer is already laid out correctly + { + wxSize clientSize = m_ctrl->GetClientSize(); + wxPoint firstVisiblePt = m_ctrl->GetFirstVisiblePoint(); + int lastY = firstVisiblePt.y + clientSize.y; + + wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetRange().GetStart()); + wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para); + while (node) + { + wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData(); + wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); + while (node2) + { + wxRichTextLine* line = node2->GetData(); + wxPoint pt = line->GetAbsolutePosition(); + wxRichTextRange range = line->GetAbsoluteRange(); + + if (pt.y > lastY) + { + node2 = wxRichTextLineList::compatibility_iterator(); + node = wxRichTextObjectList::compatibility_iterator(); + } + else if (range.GetStart() > GetPosition() && pt.y >= firstVisiblePt.y) + { + optimizationLineCharPositions.Add(range.GetStart()); + optimizationLineYPositions.Add(pt.y); + } + + if (node2) + node2 = node2->GetNext(); + } + + if (node) + node = node->GetNext(); + } + } +#endif +} + bool wxRichTextAction::Do() { m_buffer->Modify(true); @@ -6489,49 +6609,7 @@ bool wxRichTextAction::Do() wxArrayInt optimizationLineYPositions; #if wxRICHTEXT_USE_OPTIMIZED_DRAWING - // NOTE: we're assuming that the buffer is laid out correctly at this point. - // If we had several actions, which only invalidate and leave layout until the - // paint handler is called, then this might not be true. So we may need to switch - // optimisation on only when we're simply adding text and not simultaneously - // deleting a selection, for example. Or, we make sure the buffer is laid out correctly - // first, but of course this means we'll be doing it twice. - if (!m_buffer->GetDirty() && m_ctrl) // can only do optimisation if the buffer is already laid out correctly - { - wxSize clientSize = m_ctrl->GetClientSize(); - wxPoint firstVisiblePt = m_ctrl->GetFirstVisiblePoint(); - int lastY = firstVisiblePt.y + clientSize.y; - - wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetRange().GetStart()); - wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para); - while (node) - { - wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData(); - wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); - while (node2) - { - wxRichTextLine* line = node2->GetData(); - wxPoint pt = line->GetAbsolutePosition(); - wxRichTextRange range = line->GetAbsoluteRange(); - - if (pt.y > lastY) - { - node2 = wxRichTextLineList::compatibility_iterator(); - node = wxRichTextObjectList::compatibility_iterator(); - } - else if (range.GetStart() > GetPosition() && pt.y >= firstVisiblePt.y) - { - optimizationLineCharPositions.Add(range.GetStart()); - optimizationLineYPositions.Add(pt.y); - } - - if (node2) - node2 = node2->GetNext(); - } - - if (node) - node = node->GetNext(); - } - } + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); #endif m_buffer->InsertFragment(GetRange().GetStart(), m_newParagraphs); @@ -6556,10 +6634,7 @@ bool wxRichTextAction::Do() newCaretPosition = wxMin(newCaretPosition, (m_buffer->GetRange().GetEnd()-1)); - if (optimizationLineCharPositions.GetCount() > 0) - UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions); - else - UpdateAppearance(newCaretPosition, true /* send update event */); + UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions, true /* do */); wxRichTextEvent cmdEvent( wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, @@ -6574,6 +6649,13 @@ bool wxRichTextAction::Do() } case wxRICHTEXT_DELETE: { + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); +#endif + m_buffer->DeleteRange(GetRange()); m_buffer->UpdateRanges(); m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart())); @@ -6582,7 +6664,7 @@ bool wxRichTextAction::Do() if (caretPos >= m_buffer->GetRange().GetEnd()) caretPos --; - UpdateAppearance(caretPos, true /* send update event */); + UpdateAppearance(caretPos, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions, true /* do */); wxRichTextEvent cmdEvent( wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, @@ -6628,13 +6710,20 @@ bool wxRichTextAction::Undo() { case wxRICHTEXT_INSERT: { + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); +#endif + m_buffer->DeleteRange(GetRange()); m_buffer->UpdateRanges(); m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart())); long newCaretPosition = GetPosition() - 1; - UpdateAppearance(newCaretPosition, true /* send update event */); + UpdateAppearance(newCaretPosition, true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */); wxRichTextEvent cmdEvent( wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, @@ -6649,11 +6738,18 @@ bool wxRichTextAction::Undo() } case wxRICHTEXT_DELETE: { + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions); +#endif + m_buffer->InsertFragment(GetRange().GetStart(), m_oldParagraphs); m_buffer->UpdateRanges(); m_buffer->Invalidate(GetRange()); - UpdateAppearance(GetPosition(), true /* send update event */); + UpdateAppearance(GetPosition(), true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */); wxRichTextEvent cmdEvent( wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, @@ -6692,7 +6788,7 @@ bool wxRichTextAction::Undo() } /// Update the control appearance -void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent, wxArrayInt* optimizationLineCharPositions, wxArrayInt* optimizationLineYPositions) +void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent, wxArrayInt* optimizationLineCharPositions, wxArrayInt* optimizationLineYPositions, bool isDoCmd) { if (m_ctrl) { @@ -6703,7 +6799,7 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent #if wxRICHTEXT_USE_OPTIMIZED_DRAWING // Find refresh rectangle if we are in a position to optimise refresh - if (m_cmdId == wxRICHTEXT_INSERT && optimizationLineCharPositions && optimizationLineCharPositions->GetCount() > 0) + if ((m_cmdId == wxRICHTEXT_INSERT || m_cmdId == wxRICHTEXT_DELETE) && optimizationLineCharPositions) { size_t i; @@ -6714,17 +6810,57 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent int firstY = 0; int lastY = firstVisiblePt.y + clientSize.y; - bool foundStart = false; bool foundEnd = false; // position offset - how many characters were inserted int positionOffset = GetRange().GetLength(); + // Determine whether this is Do or Undo, and adjust positionOffset accordingly + if ((m_cmdId == wxRICHTEXT_DELETE && isDoCmd) || (m_cmdId == wxRICHTEXT_INSERT && !isDoCmd)) + positionOffset = - positionOffset; + // find the first line which is being drawn at the same position as it was // before. Since we're talking about a simple insertion, we can assume // that the rest of the window does not need to be redrawn. wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetPosition()); + if (para) + { + // Find line containing GetPosition(). + wxRichTextLine* line = NULL; + wxRichTextLineList::compatibility_iterator node2 = para->GetLines().GetFirst(); + while (node2) + { + wxRichTextLine* l = node2->GetData(); + wxRichTextRange range = l->GetAbsoluteRange(); + if (range.Contains(GetRange().GetStart()-1)) + { + line = l; + break; + } + node2 = node2->GetNext(); + } + + if (line) + { + // Step back a couple of lines to where we can be sure of reformatting correctly + wxRichTextLineList::compatibility_iterator lineNode = para->GetLines().Find(line); + if (lineNode) + { + lineNode = lineNode->GetPrevious(); + if (lineNode) + { + line = (wxRichTextLine*) lineNode->GetData(); + lineNode = lineNode->GetPrevious(); + if (lineNode) + line = (wxRichTextLine*) lineNode->GetData(); + } + } + + firstY = line->GetAbsolutePosition().y; + } + } + wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para); while (node) { @@ -6744,14 +6880,19 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent node2 = wxRichTextLineList::compatibility_iterator(); node = wxRichTextObjectList::compatibility_iterator(); } - else + // Detect last line in the buffer + else if (!node2->GetNext() && para->GetRange().Contains(m_buffer->GetRange().GetEnd())) { - if (!foundStart) - { - firstY = pt.y - firstVisiblePt.y; - foundStart = true; - } + foundEnd = true; + lastY = pt.y + line->GetSize().y; + node2 = wxRichTextLineList::compatibility_iterator(); + node = wxRichTextObjectList::compatibility_iterator(); + + break; + } + else + { // search for this line being at the same position as before for (i = 0; i < optimizationLineCharPositions->GetCount(); i++) { @@ -6760,7 +6901,8 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent { // Stop, we're now the same as we were foundEnd = true; - lastY = pt.y - firstVisiblePt.y; + + lastY = pt.y; node2 = wxRichTextLineList::compatibility_iterator(); node = wxRichTextObjectList::compatibility_iterator(); @@ -6778,22 +6920,21 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent node = node->GetNext(); } - if (!foundStart) - firstY = firstVisiblePt.y; + firstY = wxMax(firstVisiblePt.y, firstY); if (!foundEnd) lastY = firstVisiblePt.y + clientSize.y; - wxRect rect(firstVisiblePt.x, firstY, firstVisiblePt.x + clientSize.x, lastY - firstY); + // Convert to device coordinates + wxRect rect(m_ctrl->GetPhysicalPoint(wxPoint(firstVisiblePt.x, firstY)), wxSize(clientSize.x, lastY - firstY)); m_ctrl->RefreshRect(rect); - - // TODO: we need to make sure that lines are only drawn if in the update region. The rect - // passed to Draw is currently used in different ways (to pass the position the content should - // be drawn at as well as the relevant region). } else #endif m_ctrl->Refresh(false); +#if wxRICHTEXT_USE_OWN_CARET + m_ctrl->PositionCaret(); +#endif if (sendUpdateEvent) wxTextCtrl::SendTextUpdatedEvent(m_ctrl); } @@ -6943,6 +7084,9 @@ bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, i if (!range.IsWithin(GetRange())) return false; + if (!m_image.Ok()) + ((wxRichTextImage*) this)->LoadFromBlock(); + if (partialExtents) { if (m_image.Ok()) @@ -7204,7 +7348,7 @@ void wxRichTextImageBlock::Init() { m_data = NULL; m_dataSize = 0; - m_imageType = -1; + m_imageType = wxBITMAP_TYPE_INVALID; } void wxRichTextImageBlock::Clear() @@ -7212,7 +7356,7 @@ void wxRichTextImageBlock::Clear() delete[] m_data; m_data = NULL; m_dataSize = 0; - m_imageType = -1; + m_imageType = wxBITMAP_TYPE_INVALID; } @@ -7222,7 +7366,8 @@ void wxRichTextImageBlock::Clear() // If it's not a JPEG we can make use of 'image', already scaled, so we don't have to // load the image a 2nd time. -bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, int imageType, wxImage& image, bool convertToJPEG) +bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, wxBitmapType imageType, + wxImage& image, bool convertToJPEG) { m_imageType = imageType; @@ -7266,7 +7411,7 @@ bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, int imageTyp // Make an image block from the wxImage in the given // format. -bool wxRichTextImageBlock::MakeImageBlock(wxImage& image, int imageType, int quality) +bool wxRichTextImageBlock::MakeImageBlock(wxImage& image, wxBitmapType imageType, int quality) { m_imageType = imageType; image.SetOption(wxT("quality"), quality); @@ -7394,7 +7539,7 @@ bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream) } // Read data in hex from a stream -bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, int imageType) +bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, wxBitmapType imageType) { int dataSize = length/2;