Fix some weirdness around window sizing.

This should fix the recent issue when a larger or smaller version
is painted inside the window after resize, as well as fix ALT-→
when the current size is not an integer multiple.