fix: scale by anchor

dream-num · Jul 5, 2024 · 1c6f2aa · 1c6f2aa
1 parent f26140d
commit 1c6f2aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...ocs-drawing-ui/src/controllers/render-controllers/doc-drawing-update.render-controller.ts b/...ocs-drawing-ui/src/controllers/render-controllers/doc-drawing-update.render-controller.ts
@@ -135,7 +135,7 @@ export class DocDrawingUpdateRenderController extends Disposable implements IRen
             if (width > DRAWING_IMAGE_WIDTH_LIMIT || height > DRAWING_IMAGE_HEIGHT_LIMIT) {
                 const scaleWidth = DRAWING_IMAGE_WIDTH_LIMIT / width;
                 const scaleHeight = DRAWING_IMAGE_HEIGHT_LIMIT / height;
-                scale = Math.max(scaleWidth, scaleHeight);
+                scale = Math.min(scaleWidth, scaleHeight);
             }
 
             const docTransform = this._getImagePosition(width * scale, height * scale);

diff --git a/packages/engine-render/src/scene.transformer.ts b/packages/engine-render/src/scene.transformer.ts
@@ -921,6 +921,7 @@ export class Transformer extends Disposable implements ITransformerConfig {
                     this._topScenePointerMoveSub = topScene.onPointerMove$.subscribeEvent((moveEvt: IPointerEvent | IMouseEvent) => {
                         const { offsetX: moveOffsetX, offsetY: moveOffsetY } = moveEvt;
                         this._anchorMoving(type, moveOffsetX, moveOffsetY, scrollTimer, keepRatio, isCropper, applyObject);
+
                         scrollTimer.scrolling(moveOffsetX, moveOffsetY, () => {
                             this._anchorMoving(type, moveOffsetX, moveOffsetY, scrollTimer, keepRatio, isCropper, applyObject);
                         });
@@ -967,15 +968,15 @@ export class Transformer extends Disposable implements ITransformerConfig {
             if (left + ancestorLeft < this.zeroLeft) {
                 newTransform.left = -ancestorLeft;
                 newTransform.width = width + left;
-            } else if (left + width + ancestorLeft > topSceneWidth) {
-                newTransform.width = topSceneWidth - left - ancestorLeft;
+            } else if (left + width + ancestorLeft > topSceneWidth + this.zeroLeft) {
+                newTransform.width = this.zeroLeft + topSceneWidth - left - ancestorLeft;
             }
 
             if (top + ancestorTop < this.zeroTop) {
                 newTransform.top = -ancestorTop;
                 newTransform.height = height + top;
-            } else if (top + height + ancestorTop > topSceneHeight) {
-                newTransform.height = topSceneHeight - top - ancestorTop;
+            } else if (top + height + ancestorTop > topSceneHeight + this.zeroTop) {
+                newTransform.height = this.zeroTop + topSceneHeight - top - ancestorTop;
             }
 
             moveObject.transformByState(newTransform);