Optimize struts calculation slightly
Merge pull request #1527 from mtwebster/further-fullscreen-tweaks

Optimize struts calculation slightly