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

cleaned up the window resize function even further

Browse source
This commit is contained in:
Robert Best 2016-10-22 05:50:31 +00:00
parent cfb8f51214
commit 759ec7845b
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -110,17 +110,8 @@ const Listeners = {
$(window).resize(function () {
if (Visualize && Visualize.mGraph) {
// Store the current canvas attributes, i.e. scale and map-coordinate at the centre of the user's screen
let canvas = Visualize.mGraph.canvas;
const oldAttr = Util.logCanvasAttributes(canvas);
// 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())
// 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(oldAttr.scaleX, oldAttr.scaleY)
const newAttr = Util.logCanvasAttributes(canvas);
canvas.translate(newAttr.centreCoords.x - oldAttr.centreCoords.x, newAttr.centreCoords.y - oldAttr.centreCoords.y)
Util.resizeCanvas(Visualize.mGraph.canvas)
}
if (Active.Map && Realtime.inConversation) Realtime.positionVideos()

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

@ -1,3 +1,5 @@
/* global $ */
import { Parser, HtmlRenderer } from 'commonmark'
import Visualize from './Visualize'
@ -133,6 +135,18 @@ const Util = {
scaleY: canvas.scaleOffsetY,
centreCoords: Util.pixelsToCoords({ x: canvas.canvases[0].size.width / 2, y: canvas.canvases[0].size.height / 2 }),
};
},
resizeCanvas: function(canvas){
// Store the current canvas attributes, i.e. scale and map-coordinate at the centre of the user's screen
const oldAttr = Util.logCanvasAttributes(canvas);
// 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())
// 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(oldAttr.scaleX, oldAttr.scaleY)
const newAttr = Util.logCanvasAttributes(canvas);
canvas.translate(newAttr.centreCoords.x - oldAttr.centreCoords.x, newAttr.centreCoords.y - oldAttr.centreCoords.y)
}
}