You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2019/02/11 15:38:56 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2015] animted
pointer is scaled inversely to WB
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new ae06015 [OPENMEETINGS-2015] animted pointer is scaled inversely to WB
ae06015 is described below
commit ae060157f2e88a200292d2d1f3f8e6ae852b31d7
Author: Maxim Solodovnik <so...@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 1fee592..2837bfb 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
@@ -914,5 +914,8 @@ var Wb = function() {
wb.getFormula = function() {
return f;
};
+ wb.getZoom = function() {
+ return zoom;
+ }
return wb;
};