Merge pull request #13 from LMMS/master

From master
Proposed fox for 1408 Window size in window and full-screen modes
Merge pull request #1490 from curlymorphic/i1408

Proposed fix for #1408 Window Size in windowed and full screen modes.