Merge pull request #303 from danvk/fix-hidpi