Fix #221 Reinstate F6's original behaviour of toggling window/fullscreen modes

Fix #198 broken with F6 and Ctrl-F6 revert to original behavior