[[ RefactorSyntax ]] Fix infinite loop in getting width

livecodesebastien · livecodesebastien · commit 19b812dbdadc · 2014-02-25T17:01:13.000Z
Reverted change on scrollbars settings
diff --git a/engine/src/block.cpp b/engine/src/block.cpp
@@ -1692,6 +1692,7 @@ uint2 MCBlock::getsubwidth(MCDC *dc, int2 x, findex_t i, findex_t l)
 	else
 	{
 		findex_t sptr = i;
+        findex_t t_length = l;
 		
 		// MW-2012-02-12: [[ Bug 10662 ]] If the last char is a VTAB then ignore it.
         if (parent->TextIsLineBreak(parent->GetCodepointAtIndex(sptr + l - 1)))
@@ -1708,7 +1709,7 @@ uint2 MCBlock::getsubwidth(MCDC *dc, int2 x, findex_t i, findex_t l)
 			while (MCStringFirstIndexOfChar(parent->GetInternalStringRef(), '\t', sptr, kMCStringOptionCompareExact, eptr))
 			{
 				// Break if we've gone past the end of this block
-                if (eptr >= m_size)
+                if (eptr >= i + t_length)
 					break;
 				
 				MCRange t_range;
diff --git a/engine/src/exec-interface-field.cpp b/engine/src/exec-interface-field.cpp
@@ -567,9 +567,7 @@ void MCField::GetHScrollbar(MCExecContext& ctxt, bool& r_setting)
 
 void MCField::SetHScrollbar(MCExecContext& ctxt, bool setting)
 {
-	setflag(setting, F_HSCROLLBAR);
-    
-    if (setting)
+    if (changeflag(setting, F_HSCROLLBAR))
 	{
         
 		DoSetHScrollbar(ctxt, hscrollbar, scrollbarwidth);
@@ -584,9 +582,7 @@ void MCField::GetVScrollbar(MCExecContext& ctxt, bool& r_setting)
 
 void MCField::SetVScrollbar(MCExecContext& ctxt, bool setting)
 {
-	setflag(setting, F_VSCROLLBAR);
-    
-    if (setting)
+    if (changeflag(setting, F_VSCROLLBAR))
 	{	
 		DoSetVScrollbar(ctxt, vscrollbar, scrollbarwidth);
 		Redraw(true, textx, texty);

Original file line number	Diff line number	Diff line change
`@@ -1692,6 +1692,7 @@ uint2 MCBlock::getsubwidth(MCDC *dc, int2 x, findex_t i, findex_t l)`
`1692`	`1692`	`else`
`1693`	`1693`	`{`
`1694`	`1694`	`findex_t sptr = i;`
	`1695`	`+ findex_t t_length = l;`
`1695`	`1696`
`1696`	`1697`	`// MW-2012-02-12: [[ Bug 10662 ]] If the last char is a VTAB then ignore it.`
`1697`	`1698`	`if (parent->TextIsLineBreak(parent->GetCodepointAtIndex(sptr + l - 1)))`
`@@ -1708,7 +1709,7 @@ uint2 MCBlock::getsubwidth(MCDC *dc, int2 x, findex_t i, findex_t l)`
`1708`	`1709`	`while (MCStringFirstIndexOfChar(parent->GetInternalStringRef(), '\t', sptr, kMCStringOptionCompareExact, eptr))`
`1709`	`1710`	`{`
`1710`	`1711`	`// Break if we've gone past the end of this block`
`1711`		`- if (eptr >= m_size)`
	`1712`	`+ if (eptr >= i + t_length)`
`1712`	`1713`	`break;`
`1713`	`1714`
`1714`	`1715`	`MCRange t_range;`
Original file line number	Diff line number	Diff line change
`@@ -567,9 +567,7 @@ void MCField::GetHScrollbar(MCExecContext& ctxt, bool& r_setting)`
`567`	`567`
`568`	`568`	`void MCField::SetHScrollbar(MCExecContext& ctxt, bool setting)`
`569`	`569`	`{`
`570`		`- setflag(setting, F_HSCROLLBAR);`
`571`		`-`
`572`		`- if (setting)`
	`570`	`+ if (changeflag(setting, F_HSCROLLBAR))`
`573`	`571`	`{`
`574`	`572`
`575`	`573`	`DoSetHScrollbar(ctxt, hscrollbar, scrollbarwidth);`
`@@ -584,9 +582,7 @@ void MCField::GetVScrollbar(MCExecContext& ctxt, bool& r_setting)`
`584`	`582`
`585`	`583`	`void MCField::SetVScrollbar(MCExecContext& ctxt, bool setting)`
`586`	`584`	`{`
`587`		`- setflag(setting, F_VSCROLLBAR);`
`588`		`-`
`589`		`- if (setting)`
	`585`	`+ if (changeflag(setting, F_VSCROLLBAR))`
`590`	`586`	`{`
`591`	`587`	`DoSetVScrollbar(ctxt, vscrollbar, scrollbarwidth);`
`592`	`588`	`Redraw(true, textx, texty);`