Revert "Revert "Merge pull request livecode#1148 from runrevsebastien/bugfix-13374""

runrevmark · runrevmark · commit e75e02f4045f · 2014-09-17T10:40:08.000+01:00
This reverts commit b206663.
diff --git a/docs/notes/bugfix-13374.md b/docs/notes/bugfix-13374.md
@@ -0,0 +1 @@
+LiveCode hangs when setting the text of a field with HGRID and a hidden last line
diff --git a/engine/src/fieldf.cpp b/engine/src/fieldf.cpp
@@ -1023,14 +1023,18 @@ void MCField::drawrect(MCDC *dc, const MCRectangle &dirty)
 		{
 			setforeground(dc, DI_BORDER, False);
 			
-			int32_t cy;
-			cy = y + pgheight;
-			while(cy < grect . y + grect . height)
-			{
-				if (y >= grect . y)
-					dc -> drawline(grect . x, cy, grect . x + grect . width, cy);
-				cy += pgheight;
-			}
+            // SN-2014-09-10: [[ Bug 13374 ]] If the last line is hidden, the we take the field's lineheight.
+            if (pgheight == 0)
+                pgheight = fixedheight;
+            
+            int32_t cy;
+            cy = y + pgheight;
+            while(cy < grect . y + grect . height)
+            {
+                if (y >= grect . y)
+                    dc -> drawline(grect . x, cy, grect . x + grect . width, cy);
+                cy += pgheight;
+            }
 		}
 		
 		// MW-2012-03-15: [[ Bug 10069 ]] If we have vGrid set on the field, then render grid lines

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+LiveCode hangs when setting the text of a field with HGRID and a hidden last line`