Merge pull request #1220 from collinjackson/scaling_focus

Ensure that the item under the focal point stays in the same place despite zooming