[[ Bug 13351 ]] printing a field with listbehaviour set to true makes gray background

livecodesebastien · livecodesebastien · commit 4b9cb6799182 · 2014-10-17T16:33:45.000+01:00
diff --git a/docs/notes/bugfix-13351.md b/docs/notes/bugfix-13351.md
@@ -0,0 +1 @@
+# printing a field with listbehaviour set to true makes gray background
diff --git a/engine/src/customprinter.cpp b/engine/src/customprinter.cpp
@@ -358,12 +358,14 @@ void MCCustomMetaContext::domark(MCMark *p_mark)
 		{
             // MM-2014-04-23: [[ Bug 11884 ]] Inset the bounds. Since MCPath only accepts ints, if the inset value is uneven,
             // round up to the nearest even value, keeping behaviour as close to that of the graphics context as possible.
-			if (!(p_mark -> rectangle . inset % 2))
+            // SN-2014-10-17: [[ Bug 13351 ]] Only round up existing inset
+            if (p_mark -> rectangle . inset && !(p_mark -> rectangle . inset % 2))
 				p_mark -> rectangle . inset ++;
+            // SN-2014-10-17: [[ Bug 13351 ]] Be careful not to underflow the bounds
 			p_mark -> rectangle . bounds = MCRectangleMake(p_mark -> rectangle . bounds . x + p_mark -> rectangle . inset / 2,
 														   p_mark -> rectangle . bounds . y + p_mark -> rectangle . inset / 2, 
-														   p_mark -> rectangle . bounds . width - p_mark -> rectangle . inset, 
-														   p_mark -> rectangle . bounds . height - p_mark -> rectangle . inset);
+                                                           MCMin(p_mark -> rectangle . bounds . width, p_mark -> rectangle . bounds . width - p_mark -> rectangle . inset),
+                                                           MCMin(p_mark -> rectangle . bounds . height, p_mark -> rectangle . bounds . height - p_mark -> rectangle . inset));
 			
 			MCPath *t_path;
 			if (p_mark -> stroke != nil && p_mark -> rectangle . bounds . height == 1)
@@ -385,12 +387,14 @@ void MCCustomMetaContext::domark(MCMark *p_mark)
 		{
             // MM-2014-04-23: [[ Bug 11884 ]] Inset the bounds. Since MCPath only accepts ints, if the inset value is uneven,
             // round up to the nearest even value, keeping behaviour as close to that of the graphics context as possible.
+            // SN-2014-10-17: [[ Bug 13351 ]] Only round up existing inset
 			if (!(p_mark -> round_rectangle . inset % 2))
 				p_mark -> round_rectangle . inset ++;
+            // SN-2014-10-17: [[ Bug 13351 ]] Be careful not to underflow the bounds
 			p_mark -> round_rectangle . bounds = MCRectangleMake(p_mark -> round_rectangle . bounds . x + p_mark -> round_rectangle . inset / 2,
 														   p_mark -> round_rectangle . bounds . y + p_mark -> round_rectangle . inset / 2, 
-														   p_mark -> round_rectangle . bounds . width - p_mark -> round_rectangle . inset, 
-														   p_mark -> round_rectangle . bounds . height - p_mark -> round_rectangle . inset);
+                                                           MCMin(p_mark -> round_rectangle . bounds . width, p_mark -> round_rectangle . bounds . width - p_mark -> round_rectangle . inset),
+                                                           MCMin(p_mark -> round_rectangle . bounds . height, p_mark -> round_rectangle . bounds . height - p_mark -> round_rectangle . inset));
 			
 			MCPath *t_path;
 			t_path = MCPath::create_rounded_rectangle(p_mark -> round_rectangle . bounds, p_mark -> round_rectangle . radius / 2, p_mark -> stroke != nil);
@@ -407,12 +411,14 @@ void MCCustomMetaContext::domark(MCMark *p_mark)
 		{
             // MM-2014-04-23: [[ Bug 11884 ]] Inset the bounds. Since MCPath only accepts ints, if the inset value is uneven,
             // round up to the nearest even value, keeping behaviour as close to that of the graphics context as possible.
+            // SN-2014-10-17: [[ Bug 13351 ]] Only round up existing inset
 			if (!(p_mark -> arc . inset % 2))
 				p_mark -> arc . inset ++;
+            // SN-2014-10-17: [[ Bug 13351 ]] Be careful not to underflow the bounds
 			p_mark -> arc . bounds = MCRectangleMake(p_mark -> arc . bounds . x + p_mark -> arc . inset / 2,
 														   p_mark -> arc . bounds . y + p_mark -> arc . inset / 2, 
-														   p_mark -> arc . bounds . width - p_mark -> arc . inset, 
-														   p_mark -> arc . bounds . height - p_mark -> arc . inset);
+                                                           MCMin(p_mark -> arc . bounds . width, p_mark -> arc . bounds . width - p_mark -> arc . inset),
+                                                           MCMin(p_mark -> arc . bounds . height, p_mark -> arc . bounds . height - p_mark -> arc . inset));
 			
 			MCPath *t_path;
 			if (p_mark -> arc . complete)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# printing a field with listbehaviour set to true makes gray background`