Merge pull request #7107 from livecodepanos/bugfix-22190_2

livecodepanos · web-flow · commit 3435327a5e34 · 2019-12-16T16:02:39.000+02:00
[22190] Ensure setting spaceAbove does not affect spaceBelow
diff --git a/docs/notes/bugfix-22190.md b/docs/notes/bugfix-22190.md
@@ -0,0 +1 @@
+# Ensure setting the spaceAbove does not change the existing value of spaceBelow property
diff --git a/engine/src/exec-interface-field-chunk.cpp b/engine/src/exec-interface-field-chunk.cpp
@@ -1300,6 +1300,11 @@ static void setparagraphattr_int16(MCParagraphAttrs*& attrs, uint32_t p_flag, si
     setparagraphattr_int<int16_t, INT16_MIN, INT16_MAX>(attrs, p_flag, p_field_offset, (int16_t *)p_value);
 }
 
+static void setparagraphattr_uint16(MCParagraphAttrs*& attrs, uint32_t p_flag, size_t p_field_offset, uinteger_t *p_value)
+{
+    setparagraphattr_int<uint16_t, 0, UINT16_MAX>(attrs, p_flag, p_field_offset, (uint16_t *)p_value);
+}
+
 static void setparagraphattr_color(MCParagraphAttrs*& attrs, uint32_t p_flag, size_t p_field_offset, const MCInterfaceNamedColor& p_color)
 {
     MCColor t_color;
@@ -2734,7 +2739,7 @@ void MCParagraph::GetEffectiveSpaceAbove(MCExecContext& ctxt, uinteger_t& r_spac
 
 void MCParagraph::SetSpaceAbove(MCExecContext& ctxt, uinteger_t *p_space)
 {
-    setparagraphattr_int<uinteger_t, 0, 32767>(attrs, PA_HAS_SPACE_ABOVE, offsetof(MCParagraphAttrs, space_above), p_space);
+    setparagraphattr_uint16(attrs, PA_HAS_SPACE_ABOVE, offsetof(MCParagraphAttrs, space_above), p_space);
 }
 
 void MCParagraph::GetSpaceBelow(MCExecContext& ctxt, uinteger_t *&r_space)
@@ -2752,7 +2757,7 @@ void MCParagraph::GetEffectiveSpaceBelow(MCExecContext& ctxt, uinteger_t& r_spac
 
 void MCParagraph::SetSpaceBelow(MCExecContext& ctxt, uinteger_t *p_space)
 {
-    setparagraphattr_int<uinteger_t, 0, 32767>(attrs, PA_HAS_SPACE_BELOW, offsetof(MCParagraphAttrs, space_below), p_space);
+    setparagraphattr_uint16(attrs, PA_HAS_SPACE_BELOW, offsetof(MCParagraphAttrs, space_below), p_space);
 }
 
 void MCParagraph::DoSetTabStops(MCExecContext &ctxt, bool p_is_relative, const vector_t<uinteger_t>& p_tabs)
diff --git a/tests/lcs/core/field/spaceAbove.livecodescript b/tests/lcs/core/field/spaceAbove.livecodescript
@@ -0,0 +1,46 @@
+script "CoreFieldSpaceAbove"
+/*
+Copyright (C) 2019 LiveCode Ltd.
+
+This file is part of LiveCode.
+
+LiveCode is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License v3 as published by the Free
+Software Foundation.
+
+LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
+
+on TestSpaceAboveAndSpaceBelow
+
+   open this stack
+   create fld "myFld"
+   put "Line one & return & Line 2 & return & Line 3" into fld "myFld"
+   TestAssert "getting the effective spaceAbove of line 2", the effective spaceAbove of line 2 of fld "myFld" is 0
+   TestAssert "getting the effective spaceBelow of line 2", the effective spaceBelow of line 2 of fld "myFld" is 0
+
+   local tSpaceAbove, tSpaceBelow
+   
+   put random(5) into tSpaceAbove
+   set the spaceAbove of line 2 of fld "myFld" to tSpaceAbove
+   TestAssert "Setting the spaceAbove of line 2", the spaceAbove of line 2 of fld "myFld" is tSpaceAbove
+   
+   put random(5) into tSpaceBelow
+   set the spaceBelow of line 2 of fld "myFld" to tSpaceBelow
+   TestAssert "Setting the spaceBelow of line 2", the spaceBelow of line 2 of fld "myFld" is tSpaceBelow
+   
+   put random(5) into tSpaceAbove
+   set the spaceAbove of line 2 of fld "myFld" to tSpaceAbove
+   TestAssert "Setting the spaceAbove of line 2 does not affect the spaceBelow", the spaceBelow of line 2 of fld "myFld" is tSpaceBelow
+
+   put random(5) into tSpaceBelow
+   set the spaceBelow of line 2 of fld "myFld" to tSpaceBelow
+   TestAssert "Setting the spaceBelow of line 2 does not affect the spaceAbove", the spaceAbove of line 2 of fld "myFld" is tSpaceAbove
+
+   delete fld "myFld"
+end TestSpaceAboveAndSpaceBelow

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Ensure setting the spaceAbove does not change the existing value of spaceBelow property`
Original file line number	Diff line number	Diff line change
`@@ -1300,6 +1300,11 @@ static void setparagraphattr_int16(MCParagraphAttrs*& attrs, uint32_t p_flag, si`
`1300`	`1300`	`setparagraphattr_int<int16_t, INT16_MIN, INT16_MAX>(attrs, p_flag, p_field_offset, (int16_t *)p_value);`
`1301`	`1301`	`}`
`1302`	`1302`
	`1303`	`+static void setparagraphattr_uint16(MCParagraphAttrs& attrs, uint32_t p_flag, size_t p_field_offset, uinteger_t p_value)`
	`1304`	`+{`
	`1305`	`+ setparagraphattr_int<uint16_t, 0, UINT16_MAX>(attrs, p_flag, p_field_offset, (uint16_t *)p_value);`
	`1306`	`+}`
	`1307`	`+`
`1303`	`1308`	`static void setparagraphattr_color(MCParagraphAttrs*& attrs, uint32_t p_flag, size_t p_field_offset, const MCInterfaceNamedColor& p_color)`
`1304`	`1309`	`{`
`1305`	`1310`	`MCColor t_color;`
`@@ -2734,7 +2739,7 @@ void MCParagraph::GetEffectiveSpaceAbove(MCExecContext& ctxt, uinteger_t& r_spac`
`2734`	`2739`
`2735`	`2740`	`void MCParagraph::SetSpaceAbove(MCExecContext& ctxt, uinteger_t *p_space)`
`2736`	`2741`	`{`
`2737`		`- setparagraphattr_int<uinteger_t, 0, 32767>(attrs, PA_HAS_SPACE_ABOVE, offsetof(MCParagraphAttrs, space_above), p_space);`
	`2742`	`+ setparagraphattr_uint16(attrs, PA_HAS_SPACE_ABOVE, offsetof(MCParagraphAttrs, space_above), p_space);`
`2738`	`2743`	`}`
`2739`	`2744`
`2740`	`2745`	`void MCParagraph::GetSpaceBelow(MCExecContext& ctxt, uinteger_t *&r_space)`
`@@ -2752,7 +2757,7 @@ void MCParagraph::GetEffectiveSpaceBelow(MCExecContext& ctxt, uinteger_t& r_spac`
`2752`	`2757`
`2753`	`2758`	`void MCParagraph::SetSpaceBelow(MCExecContext& ctxt, uinteger_t *p_space)`
`2754`	`2759`	`{`
`2755`		`- setparagraphattr_int<uinteger_t, 0, 32767>(attrs, PA_HAS_SPACE_BELOW, offsetof(MCParagraphAttrs, space_below), p_space);`
	`2760`	`+ setparagraphattr_uint16(attrs, PA_HAS_SPACE_BELOW, offsetof(MCParagraphAttrs, space_below), p_space);`
`2756`	`2761`	`}`
`2757`	`2762`
`2758`	`2763`	`void MCParagraph::DoSetTabStops(MCExecContext &ctxt, bool p_is_relative, const vector_t<uinteger_t>& p_tabs)`