zcy
/
svgedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Maintain aspect ratio by default for images (#847)

master
pmkrawczyk 2022-11-05 19:32:12 +01:00 committed by GitHub
parent ae243ce906
commit e08648c8f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/svgcanvas/event.js
View File

@ -277,7 +277,9 @@ const mouseMoveEvent = (evt) => {
} }
translateOrigin.setTranslate(-(left + tx), -(top + ty)) translateOrigin.setTranslate(-(left + tx), -(top + ty))
if (evt.shiftKey) { // For images, we maintain aspect ratio by default and relax when shift pressed
const maintainAspectRatio = (selected.tagName !== 'image' && evt.shiftKey) || (selected.tagName === 'image' && !evt.shiftKey)
if (maintainAspectRatio) {
if (sx === 1) { if (sx === 1) {
sx = sy sx = sy
} else { sy = sx } } else { sy = sx }
@ -343,12 +345,16 @@ const mouseMoveEvent = (evt) => {
case 'square': case 'square':
case 'rect': case 'rect':
case 'image': { case 'image': {
const square = (svgCanvas.getCurrentMode() === 'square') || evt.shiftKey // For images, we maintain aspect ratio by default and relax when shift pressed
const maintainAspectRatio = (svgCanvas.getCurrentMode() === 'square') ||
(svgCanvas.getCurrentMode() === 'image' && !evt.shiftKey) ||
(svgCanvas.getCurrentMode() !== 'image' && evt.shiftKey)
let let
w = Math.abs(x - svgCanvas.getStartX()) w = Math.abs(x - svgCanvas.getStartX())
let h = Math.abs(y - svgCanvas.getStartY()) let h = Math.abs(y - svgCanvas.getStartY())
let newX; let newY let newX; let newY
if (square) { if (maintainAspectRatio) {
w = h = Math.max(w, h) w = h = Math.max(w, h)
newX = svgCanvas.getStartX() < x ? svgCanvas.getStartX() : svgCanvas.getStartX() - w newX = svgCanvas.getStartX() < x ? svgCanvas.getStartX() : svgCanvas.getStartX() - w
newY = svgCanvas.getStartY() < y ? svgCanvas.getStartY() : svgCanvas.getStartY() - h newY = svgCanvas.getStartY() < y ? svgCanvas.getStartY() : svgCanvas.getStartY() - h