PanAndZoom | Pan and zoom control for Avalonia

Update: I found a solution to my own question. See answer below.

I'm working on a center-and-zoom feature for my canvas. When the user clicks on the screen, the clicked point should be moved to the center and zoomed in.

I have two canvases. The first canvas is rendered on screen and shows a portion of the second canvas. The second canvas is not a true "OffscreenCanvas" but is stored in memory only.

The panning and zooming is done in increments using requestAnimationFrame.

Since it's probably a good idea to let the "offscreen canvas" remain unaltered, I'm attempting to apply all of the changes to the onscreen canvas. Panning is simple enough, but how to combine panning and zooming?

In the current code, zooming is achieved by shrinking the size of the viewport (viewportWidth or Height -= viewportWidth or Height * 0.01). I then compensate for the smaller viewport by panning a bit further than I would have otherwise (+ viewportWidth or Height * 0.01 * 0.5).

[![image explaining my problem with panning and zooming][1]][1]

However, with this solution, the screen centers on a point to the left of where the user clicked. Can you tell me what I'm doing wrong?

Alternatively, if there is a better way to go about this, I would be very happy to hear about it.

This is what I've come up with so far: