Skip to content

Improve zoom and scroll #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve zoom and scroll #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/js/structurizr-diagram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ structurizr.ui.Diagram = function(id, diagramIsEditable, constructionCompleteCal
const DEFAULT_MAX_ZOOM_SCALE = 2;
var maxZoomScale = DEFAULT_MAX_ZOOM_SCALE;
const zoomSteps = 40;
var zoomDelta = (maxZoomScale - minZoomScale) / zoomSteps;
var zoomFactor = Math.pow(maxZoomScale / minZoomScale, 1 / zoomSteps);
var pageSizeDelta = 100;

const thumbnailWidth = 400;
Expand Down Expand Up @@ -577,7 +577,7 @@ structurizr.ui.Diagram = function(id, diagramIsEditable, constructionCompleteCal
if (embedded) {
self.zoomFitWidth();
minZoomScale = scale;
zoomDelta = (maxZoomScale - minZoomScale) / zoomSteps;
zoomFactor = Math.pow(maxZoomScale / minZoomScale, 1 / zoomSteps);
} else {
self.zoomToWidthOrHeight();
}
Expand Down Expand Up @@ -972,7 +972,7 @@ structurizr.ui.Diagram = function(id, diagramIsEditable, constructionCompleteCal
if (embedded) {
self.zoomFitWidth();
minZoomScale = scale;
zoomDelta = (maxZoomScale - minZoomScale) / zoomSteps;
zoomFactor = Math.pow(maxZoomScale / minZoomScale, 1 / zoomSteps);
} else {
maxZoomScale = DEFAULT_MAX_ZOOM_SCALE;
self.zoomToWidthOrHeight();
Expand Down Expand Up @@ -1632,7 +1632,7 @@ structurizr.ui.Diagram = function(id, diagramIsEditable, constructionCompleteCal
function setZoomAndMargins() {
minZoomScale = scale;
maxZoomScale = DEFAULT_MAX_ZOOM_SCALE;
zoomDelta = (maxZoomScale - minZoomScale) / zoomSteps;
zoomFactor = Math.pow(maxZoomScale / minZoomScale, 1 / zoomSteps);

var minimumWidth = minZoomScale * diagramWidth;
var minimumHeight = minZoomScale * diagramHeight;
Expand Down Expand Up @@ -3915,12 +3915,14 @@ structurizr.ui.Diagram = function(id, diagramIsEditable, constructionCompleteCal
this.scrollToPoint(centreX, centreY, clientTarget.x, clientTarget.y);
};

this.zoomIn = function(evt) {
zoomToAndScroll(Math.min(scale + zoomDelta, maxZoomScale), evt);
this.zoomIn = function(evt, slow) {
const speedFactor = slow ? 0.5 : 1;
zoomToAndScroll(Math.min(scale * (zoomFactor ** speedFactor), maxZoomScale), evt);
};

this.zoomOut = function(evt) {
zoomToAndScroll(Math.max(scale - zoomDelta, minZoomScale), evt);
this.zoomOut = function(evt, slow) {
const speedFactor = slow ? 0.5 : 1;
zoomToAndScroll(Math.max(scale / (zoomFactor ** speedFactor), minZoomScale), evt);
};

function zoomToAndScroll(zoomScale, evt) {
Expand Down Expand Up @@ -5872,8 +5874,8 @@ structurizr.ui.Diagram = function(id, diagramIsEditable, constructionCompleteCal

var deltaX = (dragStartPosition.x - x);
var deltaY = (dragStartPosition.y - y);
viewport.scrollLeft(scrollStartPosition.x + (deltaX * scale));
viewport.scrollTop(scrollStartPosition.y + (deltaY * scale));
viewport.scrollLeft(scrollStartPosition.x + (deltaX));
viewport.scrollTop(scrollStartPosition.y + (deltaY));
}
}

Expand Down Expand Up @@ -7240,4 +7242,4 @@ structurizr.ui.PaperSizes = function() {
return definitions[paperSize];
};

};
};
6 changes: 3 additions & 3 deletions src/static.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@
document.getElementById('diagram-viewport').addEventListener('wheel', function (event) {
if (event.ctrlKey === true) {
if (event.wheelDelta > 0) {
structurizr.diagram.zoomIn(event);
structurizr.diagram.zoomIn(event, true);
} else {
structurizr.diagram.zoomOut(event);
structurizr.diagram.zoomOut(event, true);
}

event.preventDefault();
Expand Down Expand Up @@ -448,4 +448,4 @@
structurizr.diagram.setKeyboardShortcutsEnabled(true);
});
}
</script>
</script>