Repository: openmeetings Updated Branches: refs/heads/4.0.x a5f07aa67 -> 42c3ea0a1
[OPENMEETINGS-1779] small documents are zoomed to fit WB Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/42c3ea0a Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/42c3ea0a Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/42c3ea0a Branch: refs/heads/4.0.x Commit: 42c3ea0a12b6a4162eafcceb36136f1a9da0c151 Parents: a5f07aa Author: Maxim Solodovnik <[email protected]> Authored: Sat Dec 9 15:45:45 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Dec 9 15:45:45 2017 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/openmeetings/web/room/wb/WbPanel.java | 6 ++++-- .../main/java/org/apache/openmeetings/web/room/wb/wb-board.js | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/42c3ea0a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java index 1537eab..63b55e9 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java @@ -537,8 +537,10 @@ public class WbPanel extends AbstractWbPanel { private static void updateWbSize(Whiteboard wb, final BaseFileItem fi) { int w = fi.getWidth() == null ? DEFAULT_WIDTH : fi.getWidth(); int h = fi.getHeight() == null ? DEFAULT_HEIGHT : fi.getHeight(); - wb.setWidth(Math.max(wb.getWidth(), w)); - wb.setHeight(Math.max(wb.getHeight(), h)); + double scale = 1. * wb.getWidth() / w; + scale = scale < 1 ? 1 : scale; + wb.setWidth(Math.max(wb.getWidth(), (int)(w * scale))); + wb.setHeight(Math.max(wb.getHeight(), (int)(h * scale))); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/42c3ea0a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js index 5a76dcd..e58623e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js @@ -308,7 +308,10 @@ var Wb = function() { addCanvas(); } const canvas = canvases[i]; - canvas.setBackgroundImage(_o._src + "&slide=" + i, canvas.renderAll.bind(canvas), {}); + let scale = width / _o.width; + scale = scale < 1 ? 1 : scale; + canvas.setBackgroundImage(_o._src + "&slide=" + i, canvas.renderAll.bind(canvas) + , {scaleX: scale, scaleY: scale}); } _updateZoomPanel(); if (ccount !== canvases.length) {
