Fix struts again for corner-case scenarios

Fixed cases where the struts weren't aligned properly and the panel ended up being drawn over top of windows. Also un-broke L/R oriented panels I believe.

Also Vim decided to reformat things and I didn't realize this until after pushing. Seems to have all been good fixes though so.... *shrug* maybe?