glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

simplified the window resize function by adding a Util function that logs the canvas attributes.

Browse source
This commit is contained in:
Robert Best 2016-10-22 05:21:32 +00:00
parent 1cd7e22c40
commit cfb8f51214
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
frontend/src/Metamaps/Listeners.js
View file

@ -110,24 +110,17 @@ const Listeners = {
$(window).resize(function () { $(window).resize(function () {
if (Visualize && Visualize.mGraph) { if (Visualize && Visualize.mGraph) {
// Find the current canvas scale and map-coordinate at the centre of the user's screen // Store the current canvas attributes, i.e. scale and map-coordinate at the centre of the user's screen
let canvas = Visualize.mGraph.canvas let canvas = Visualize.mGraph.canvas;
const scaleX = canvas.scaleOffsetX const oldAttr = Util.logCanvasAttributes(canvas);
const scaleY = canvas.scaleOffsetY
const centrePixX = canvas.canvases[0].size.width / 2
const centrePixY = canvas.canvases[0].size.height / 2
const centreCoords = Util.pixelsToCoords({ x: centrePixX, y: centrePixY })
// Resize the canvas to fill the new window size. Based on how JIT works, this also resets the map back to scale 1 and tranlations = 0 // Resize the canvas to fill the new window size. Based on how JIT works, this also resets the map back to scale 1 and tranlations = 0
canvas.resize($(window).width(), $(window).height()) canvas.resize($(window).width(), $(window).height())
// Return the map to the original scale, and then put the previous central map-coordinate back to the centre of user's newly resized screen // Return the map to the original scale, and then put the previous central map-coordinate back to the centre of user's newly resized screen
canvas.scale(scaleX, scaleY) canvas.scale(oldAttr.scaleX, oldAttr.scaleY)
const newCentrePixX = canvas.canvases[0].size.width / 2 const newAttr = Util.logCanvasAttributes(canvas);
const newCentrePixY = canvas.canvases[0].size.height / 2 canvas.translate(newAttr.centreCoords.x - oldAttr.centreCoords.x, newAttr.centreCoords.y - oldAttr.centreCoords.y)
const newCentreCoords = Util.pixelsToCoords({ x: newCentrePixX, y: newCentrePixY })
canvas.translate(newCentreCoords.x - centreCoords.x, newCentreCoords.y - centreCoords.y)
} }
if (Active.Map && Realtime.inConversation) Realtime.positionVideos() if (Active.Map && Realtime.inConversation) Realtime.positionVideos()

7
frontend/src/Metamaps/Util.js
View file

@ -126,6 +126,13 @@ const Util = {
// use safe: true to filter xss // use safe: true to filter xss
return new HtmlRenderer({ safe: true }) return new HtmlRenderer({ safe: true })
.render(new Parser().parse(text)) .render(new Parser().parse(text))
},
logCanvasAttributes: function(canvas){
return {
scaleX: canvas.scaleOffsetX,
scaleY: canvas.scaleOffsetY,
centreCoords: Util.pixelsToCoords({ x: canvas.canvases[0].size.width / 2, y: canvas.canvases[0].size.height / 2 }),
};
} }
} }