First part of a layout optimization

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index ab68f2f3930344cc652a16559070bfeb9e8c8f72..e6de20bf169c61be400cbf198ffd21dea2e0c519 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -425,13 +425,13 @@ bool wxRichTextBox::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTex
 }
 
 /// Lay the item out
 }
 
 /// Lay the item out

-bool wxRichTextBox::Layout(wxDC& dc, const wxRect& rect, int style)
+bool wxRichTextBox::Layout(wxDC& dc, const wxRect& rect, const wxRichTextRange& affected, int style)

 {
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
         wxRichTextObject* child = node->GetData();
 {
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
         wxRichTextObject* child = node->GetData();

-        child->Layout(dc, rect, style);
+        child->Layout(dc, rect, affected, style);

 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }


@@ -513,7 +513,7 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range,
 }
 
 /// Lay the item out
 }
 
 /// Lay the item out

-bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int style)
+bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, const wxRichTextRange& affected, int style)

 {
     wxRect availableSpace(rect.x + m_leftMargin,
                           rect.y + m_topMargin,
 {
     wxRect availableSpace(rect.x + m_leftMargin,
                           rect.y + m_topMargin,


@@ -521,20 +521,70 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl
                           rect.height - m_topMargin - m_bottomMargin);
 
     int maxWidth = 0;
                           rect.height - m_topMargin - m_bottomMargin);
 
     int maxWidth = 0;

-
+    

     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();

+    
+    // If we know what range is affected, start laying out from that point on.
+    if (affected.GetStart() > GetRange().GetStart())
+    {
+        wxRichTextParagraph* firstParagraph = GetParagraphAtPosition(affected.GetStart());
+        if (firstParagraph)
+        {
+            wxRichTextObjectList::compatibility_iterator firstNode = m_children.Find(firstParagraph);
+            wxRichTextObjectList::compatibility_iterator previousNode = firstNode ? node->GetPrevious() : (wxRichTextObjectList::compatibility_iterator) NULL;
+            if (firstNode && previousNode)
+            {
+                wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph);
+                availableSpace.y = previousParagraph->GetPosition().y + previousParagraph->GetCachedSize().y;
+                
+                // Now we're going to start iterating from the first affected paragraph.
+                node = firstNode;
+            }
+        }
+    }
+

     while (node)
     {
         // Assume this box only contains paragraphs
 
         wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
         wxASSERT (child != NULL);
     while (node)
     {
         // Assume this box only contains paragraphs
 
         wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
         wxASSERT (child != NULL);

+        
+        if (child && !child->GetRange().IsOutside(affected))
+        {
+            child->Layout(dc, availableSpace, affected, style);

 
 

-        child->Layout(dc, availableSpace, style);
-
-        // Layout must set the cached size
-        availableSpace.y += child->GetCachedSize().y;
-        maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
+            // Layout must set the cached size
+            availableSpace.y += child->GetCachedSize().y;
+            maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
+        }
+        else
+        {
+            // We're outside the immediately affected range, so now let's just
+            // move everything up or down. This assumes that all the children have previously
+            // been laid out and have wrapped line lists associated with them.
+            // TODO: check all paragraphs before the affected range.
+            
+            int inc = availableSpace.y - child->GetPosition().y;
+            
+            while (node)
+            {
+                wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+                if (child)
+                {
+                    if (child->GetLines().GetCount() == 0)
+                        child->Layout(dc, availableSpace, affected, style);
+                    else
+                        child->SetPosition(wxPoint(child->GetPosition().x, child->GetPosition().y + inc));
+                
+                    availableSpace.y += child->GetCachedSize().y;
+                    maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
+                }
+                
+                node = node->GetNext();                
+            }
+            break;
+        }

 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }


@@ -1833,7 +1883,7 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range),
 }
 
 /// Lay the item out
 }
 
 /// Lay the item out

-bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
+bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, const wxRichTextRange& affected, int style)

 {
     ClearLines();
 
 {
     ClearLines();
 


@@ -1905,7 +1955,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
         // can't tell the position until the size is determined. So possibly introduce
         // another layout phase.
 
         // can't tell the position until the size is determined. So possibly introduce
         // another layout phase.
 

-        child->Layout(dc, rect, style);
+        child->Layout(dc, rect, affected, style);

 
         // Available width depends on whether we're on the first or subsequent lines
         int availableSpaceForText = (lineCount == 0 ? availableTextSpaceFirstLine : availableTextSpaceSubsequentLines);
 
         // Available width depends on whether we're on the first or subsequent lines
         int availableSpaceForText = (lineCount == 0 ? availableTextSpaceFirstLine : availableTextSpaceSubsequentLines);


@@ -2829,7 +2879,7 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
 }
 
 /// Lay the item out
 }
 
 /// Lay the item out

-bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), int WXUNUSED(style))
+bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), const wxRichTextRange& WXUNUSED(affected), int WXUNUSED(style))

 {
     if (GetAttributes().GetFont().Ok())
         dc.SetFont(GetAttributes().GetFont());
 {
     if (GetAttributes().GetFont().Ok())
         dc.SetFont(GetAttributes().GetFont());


@@ -4002,7 +4052,7 @@ bool wxRichTextImage::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichT
 }
 
 /// Lay the item out
 }
 
 /// Lay the item out

-bool wxRichTextImage::Layout(wxDC& WXUNUSED(dc), const wxRect& rect, int WXUNUSED(style))
+bool wxRichTextImage::Layout(wxDC& WXUNUSED(dc), const wxRect& rect, const wxRichTextRange& WXUNUSED(affected), int WXUNUSED(style))

 {
     if (!m_image.Ok())
         LoadFromBlock();
 {
     if (!m_image.Ok())
         LoadFromBlock();

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 872fea90187eadf4d5c5a0a78da5833e977ea662..d470dd8c9f00b184fc5d631b1442740590162977 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -231,16 +231,17 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 
     wxRegion dirtyRegion = GetUpdateRegion();
 
 
     wxRegion dirtyRegion = GetUpdateRegion();
 

-    wxRect availableSpace(GetLogicalPoint(wxPoint(0, 0)), GetClientSize());
+    wxRect drawingArea(GetLogicalPoint(wxPoint(0, 0)), GetClientSize());
+    wxRect availableSpace(wxPoint(0, 0), GetClientSize());

     if (GetBuffer().GetDirty())
     {
     if (GetBuffer().GetDirty())
     {

-        GetBuffer().Layout(dc, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);
+        GetBuffer().Layout(dc, availableSpace, GetBuffer().GetRange(), wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);

         GetBuffer().SetDirty(false);
         SetupScrollbars();
         PositionCaret();
     }
 
         GetBuffer().SetDirty(false);
         SetupScrollbars();
         PositionCaret();
     }
 

-    GetBuffer().Draw(dc, GetBuffer().GetRange(), GetSelectionRange(), availableSpace, 0 /* descent */, 0 /* flags */);
+    GetBuffer().Draw(dc, GetBuffer().GetRange(), GetSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);

 }
 
 // Empty implementation, to prevent flicker
 }
 
 // Empty implementation, to prevent flicker


@@ -2217,7 +2218,7 @@ bool wxRichTextCtrl::Layout()
 
     GetBuffer().Defragment();
     GetBuffer().UpdateRanges();     // If items were deleted, ranges need recalculation
 
     GetBuffer().Defragment();
     GetBuffer().UpdateRanges();     // If items were deleted, ranges need recalculation

-    GetBuffer().Layout(dc, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);
+    GetBuffer().Layout(dc, availableSpace, GetBuffer().GetRange(), wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);

     GetBuffer().SetDirty(false);
     
     if (!IsFrozen())
     GetBuffer().SetDirty(false);
     
     if (!IsFrozen())