Elgato_dark/idraw
1
0
Fork 0
mirror of https://github.com/idrawjs/idraw synced 2026-05-24 10:08:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fix the scaling state should be adjusted when rotating elements

Browse source
This commit is contained in:
chenshenhai 2021-09-18 22:26:14 +08:00
parent 5190803ba5
commit ef3c2d7bb8
3 changed files with 44 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
packages/core/src/lib/helper.ts
View file

@ -50,7 +50,7 @@ export class Helper implements TypeHelper {
return null;
}
isPointInElementWrapperDot(p: TypePoint):
isPointInElementWrapperDot(p: TypePoint, data?: TypeData):
[
string | null | undefined,
TypeHelperWrapperDotDirection | null,
@ -65,10 +65,16 @@ export class Helper implements TypeHelper {
}
const wrapper = this._helperConfig.selectedElementWrapper;
const dots = [
wrapper.dots.topLeft, wrapper.dots.top, wrapper.dots.topRight, wrapper.dots.right,
wrapper.dots.bottomRight, wrapper.dots.bottom, wrapper.dots.bottomLeft, wrapper.dots.left,
wrapper.dots.right,
wrapper.dots.topRight,
wrapper.dots.top,
wrapper.dots.topLeft,
wrapper.dots.left,
wrapper.dots.bottomLeft,
wrapper.dots.bottom,
wrapper.dots.bottomRight,
];
const directionNames: TypeHelperWrapperDotDirection[] = [
let directionNames: TypeHelperWrapperDotDirection[] = [
'right',
'top-right',
'top',
@ -78,6 +84,37 @@ export class Helper implements TypeHelper {
'bottom',
'bottom-right',
];
let angleMoveNum = 0;
if (data && uuid) {
const elemIdx = this.getElementIndexByUUID(uuid);
if (elemIdx !== null && elemIdx >= 0) {
const elem = data.elements[elemIdx];
let angle = elem.angle;
if (angle < 0) {
angle += 360;
}
if (angle < 45) {
angleMoveNum = 0
} else if (angle < 90) {
angleMoveNum = 1
} else if (angle < 135) {
angleMoveNum = 2
} else if (angle < 180) {
angleMoveNum = 3
} else if (angle < 225) {
angleMoveNum = 4
} else if (angle < 270) {
angleMoveNum = 5
} else if (angle < 315) {
angleMoveNum = 6
}
}
}
if (angleMoveNum > 0) {
directionNames = directionNames.slice(-angleMoveNum).concat(directionNames.slice(0, -angleMoveNum))
}
rotateContext(ctx, wrapper.translate, wrapper.radian || 0, () => {
for (let i = 0; i < dots.length; i ++) {
const dot = dots[i];

4
packages/core/src/lib/mapper.ts
View file

@ -46,14 +46,14 @@ export class Mapper {
if (!this.isEffectivePoint(p)) {
return { cursor, elementUUID};
}
const [uuid, direction] = this[_helper].isPointInElementWrapperDot(p);
const [uuid, direction] = this[_helper].isPointInElementWrapperDot(p, data);
if (uuid && direction) {
switch (direction) {
case 'top-right' : {
cursor = 'ne-resize';
break;
}
case 'top-left' : {
cursor = 'nw-resize';
break;

2
packages/core/src/mixins/event.ts
View file

@ -59,7 +59,7 @@ function handlePoint(core: Core) {
// Coontroll Element-List
core[_tempData].set('mode', Mode.SELECT_ELEMENT_LIST);
} else {
const [uuid, direction] = core[_helper].isPointInElementWrapperDot(point);
const [uuid, direction] = core[_helper].isPointInElementWrapperDot(point, core[_data]);
if (uuid && direction) {
// Controll Element-Wrapper
core[_tempData].set('mode', Mode.SELECT_ELEMENT_WRAPPER_DOT);