[Bug 13923] Make sure the formattedHeight of a button takes into account the icon's height, if any

livecodepanos · livecodepanos · commit c27b83c6fd74 · 2015-07-15T14:59:39.000+01:00
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -1890,8 +1890,8 @@ Exec_stat MCButton::getprop(uint4 parid, Properties which, MCExecPoint& ep, Bool
 				if (icons->curicon != NULL)
 				{
 					MCRectangle trect = icons->curicon->getrect();
-					if (trect.height > fheight)
-						fheight = trect.height;
+					// PM-2015-07-15: [[ Bug 13923 ]] If a button has an icon, increase its formattedHeight by the icon's height
+					fheight += trect.height;
 				}
 			}
 			else if ((getstyleint(flags) == F_CHECK || getstyleint(flags) == F_RADIO) && CHECK_SIZE > fheight)

Original file line number	Diff line number	Diff line change
`@@ -1890,8 +1890,8 @@ Exec_stat MCButton::getprop(uint4 parid, Properties which, MCExecPoint& ep, Bool`
`1890`	`1890`	`if (icons->curicon != NULL)`
`1891`	`1891`	`{`
`1892`	`1892`	`MCRectangle trect = icons->curicon->getrect();`
`1893`		`- if (trect.height > fheight)`
`1894`		`- fheight = trect.height;`
	`1893`	`+ // PM-2015-07-15: [[ Bug 13923 ]] If a button has an icon, increase its formattedHeight by the icon's height`
	`1894`	`+ fheight += trect.height;`
`1895`	`1895`	`}`
`1896`	`1896`	`}`
`1897`	`1897`	`else if ((getstyleint(flags) == F_CHECK \|\| getstyleint(flags) == F_RADIO) && CHECK_SIZE > fheight)`