Form truncates columns if final row is short.

[Felix Guntrip]

The form_cols count is collected as each row is drawn; if the final row has less columns, when the form is scanned back into the array, it will only search as many columns as the final row.

Solution - only set form_cols is the new value is higher.