This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch 4.0.x in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push: new 856b9fd [OPENMEETINGS-2015] animted pointer is scaled inversely to WB 856b9fd is described below commit 856b9fdc3b9b55fbaab11467023cedc7e4594de0 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Mon Feb 11 22:38:14 2019 +0700 [OPENMEETINGS-2015] animted pointer is scaled inversely to WB --- .../main/java/org/apache/openmeetings/web/room/wb/raw-tool-apointer.js | 3 +++ .../src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js | 3 +++ 2 files changed, 6 insertions(+) diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-apointer.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-apointer.js index 7947ed9..fcec230 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-apointer.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-apointer.js @@ -4,6 +4,7 @@ var APointer = function(wb, s) { pointer.user = ''; pointer.create = function(canvas, o) { fabric.Image.fromURL('./css/images/pointer.png', function(img) { + const scale = 1. / wb.getZoom(); img.set({ left:15 , originX: 'right' @@ -34,6 +35,8 @@ var APointer = function(wb, s) { const group = new fabric.Group([circle1, circle2, img, text], { left: o.x - 20 , top: o.y - 20 + , scaleX: scale + , scaleY: scale }); canvas.add(group); diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js index b97e4ad..d9e37de 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js @@ -904,5 +904,8 @@ var Wb = function() { wb.getFormula = function() { return f; }; + wb.getZoom = function() { + return zoom; + } return wb; };