Small tweaks to earlier graphie-geometry fix

These are some tweaks to the quad fix that was pushed a while back.  The main fix is to avoid #71833, a rare occurrence with figures of sideRatio 1.  When testing that fix I saw that obtuse angles (depending on the orientation of the figure) needed a little more room than I gave them the first time, so I added that in as well.