Regression: Swing button label wrapping with hidpi

The fix for 8172025: HiDPI with non-integer scale factor - SPANs in HTML are rendered overlapping each other
appears to have introduced a regression.

To reproduce:
- configure windows 7 to use 120dpi,
- run SwingSet2
- switch to the Windows L&F button demo

The button labeled "Three!" will render the text as
"Three
     !
"
even though there is oceans of space ..

Attached image shows this.

There may be other consequences but this is the one I see.