Merge pull request livecode#1620 from runrevsebastien/bugfix-14161

livecodesebastien · livecodesebastien · commit 71b98a3db7ca · 2014-12-18T18:34:02.000Z
[[ Bug 14161 ]] Only forces re-layout of paragraphs after a prop setting...
diff --git a/docs/notes/bugfix-14161.md b/docs/notes/bugfix-14161.md
@@ -0,0 +1 @@
+# V7.0.1-rc3 IDE is slow
diff --git a/engine/src/exec-interface-field-chunk.cpp b/engine/src/exec-interface-field-chunk.cpp
@@ -874,11 +874,13 @@ MCParagraph* PrepareLayoutSettings(bool all, MCField *p_field, uint32_t p_part_i
 
 // SN-2014-11-04: [[ Bug 13934 ]] Update the area of the field to redraw,
 //  depending on the paragraph settings.
-void LayoutParagraph(MCParagraph* p_paragraph, MCFieldLayoutSettings &x_layout_settings)
+// SN-2014-12-18: [[ Bug 14161 ]] Add a parameter to force the re-layout of a paragraph
+void LayoutParagraph(MCParagraph* p_paragraph, MCFieldLayoutSettings &x_layout_settings, bool p_force)
 {
     // AL-2014-07-14: [[ Bug 12789 ]] Defragging can cause paragraph to need layout, do make sure we relayout
     //  if it did. Otherwise setting properties that avoid relayout can cause crashes.
-    if (p_paragraph -> getneedslayout() && !x_layout_settings . all && p_paragraph->getopened())
+    // SN-2014-12-18: [[ Bug 14161 ]] The relayout can be forced
+    if (p_force || (p_paragraph -> getneedslayout() && !x_layout_settings . all && p_paragraph->getopened()))
     {
         // MW-2012-01-25: [[ ParaStyles ]] Ask the paragraph to reflow itself.
         // AL-2014-09-22: [[ Bug 11817 ]] If we changed the amount of lines of this paragraph
@@ -938,7 +940,8 @@ template<typename T> void SetParagraphPropOfCharChunk(MCExecContext& ctxt, MCFie
         sptr -> cleanattrs();
 
         // SN-2014-11-04: [[ Bug 13934 ]] Laying out a field refactored.
-        LayoutParagraph(sptr, t_layout_settings);
+        // SN-2014-12-18: [[ Bug 14161 ]] Forces the re-layout of this paragraph which has been changed
+        LayoutParagraph(sptr, t_layout_settings, true);
         
         ei -= sptr->gettextlengthcr();
         sptr = sptr->next();
@@ -1108,7 +1111,8 @@ template<typename T> void SetCharPropOfCharChunk(MCExecContext& ctxt, MCField *p
             // end of MCParagraph scope
 
             // SN-2014-11-04: [[ Bug 13934 ]] Laying out a field refactored.
-            LayoutParagraph(pgptr, t_layout_settings);
+            // SN-2014-12-18: [[ Bug 14161 ]] Add a parameter to force the re-layout of a paragraph
+            LayoutParagraph(pgptr, t_layout_settings, false);
         }
 
         si = MCU_max(0, si - t_pg_length);
@@ -1218,7 +1222,8 @@ template<typename T> void SetArrayCharPropOfCharChunk(MCExecContext& ctxt, MCFie
             // end of MCParagraph scope
 
             // SN-2014-11-04: [[ Bug 13934 ]] Laying out a field refactored.
-            LayoutParagraph(pgptr, t_layout_settings);
+            // SN-2014-12-18: [[ Bug 14161 ]] Add a parameter to force the re-layout of a paragraph
+            LayoutParagraph(pgptr, t_layout_settings, false);
         }
         
         si = MCU_max(0, si - t_pg_length);
diff --git a/engine/src/exec-interface-field.cpp b/engine/src/exec-interface-field.cpp
@@ -323,7 +323,8 @@ MCExecCustomTypeInfo *kMCInterfaceFieldTabAlignmentsTypeInfo = &_kMCInterfaceFie
 void MCField::Relayout(bool reset, int4 xoffset, int4 yoffset)
 {
     // SN-2014-11-24: [[ Bug 14053 ]] do_recompute was always called with true in 6.x (needed for the text alignment)
-    do_recompute(true);
+    // SN-2014-12-18: [[ Bug 14161 ]] We don't want to recompute all the paragraphs of a field at any change
+    do_recompute(reset);
     
 	if (reset)
 		resetparagraphs();
diff --git a/engine/src/field.h b/engine/src/field.h
@@ -251,7 +251,8 @@ class MCField : public MCControl
 
     // SN-2014-11-04: [[ Bug 13934 ]] Refactor the laying out the field when setting properties
     friend MCParagraph* PrepareLayoutSettings(bool all, MCField *p_field, uint32_t p_part_id, findex_t &si, findex_t &ei, MCFieldLayoutSettings &r_layout_settings);
-    friend void LayoutParagraph(MCParagraph *p_paragraph, MCFieldLayoutSettings &x_settings);
+    // SN-2014-12-18: [[ Bug 14161 ]] Add a parameter to force the re-layout of a paragraph
+    friend void LayoutParagraph(MCParagraph* p_paragraph, MCFieldLayoutSettings &x_layout_settings, bool p_force);
     friend void FinishLayout(MCFieldLayoutSettings &x_settings);
 
 	MCField();

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,8 @@ MCExecCustomTypeInfo *kMCInterfaceFieldTabAlignmentsTypeInfo = &_kMCInterfaceFie`
`323`	`323`	`void MCField::Relayout(bool reset, int4 xoffset, int4 yoffset)`
`324`	`324`	`{`
`325`	`325`	`// SN-2014-11-24: [[ Bug 14053 ]] do_recompute was always called with true in 6.x (needed for the text alignment)`
`326`		`- do_recompute(true);`
	`326`	`+ // SN-2014-12-18: [[ Bug 14161 ]] We don't want to recompute all the paragraphs of a field at any change`
	`327`	`+ do_recompute(reset);`
`327`	`328`
`328`	`329`	`if (reset)`
`329`	`330`	`resetparagraphs();`