Browse Source

Revert "Change units on resizing to pixels"

This reverts commit 603e177baedd812cb5b899bac0d2ae7e738c701b.
pull/3220/head
Dmytro Bartieniev 6 years ago
parent
commit
8d97c10fc6
  1. 13
      src/commands/view/SelectComponent.js

13
src/commands/view/SelectComponent.js

@ -463,7 +463,14 @@ export default {
} }
const { store, selectedHandler, config } = options; const { store, selectedHandler, config } = options;
const { keyHeight, keyWidth, autoHeight, autoWidth } = config; const {
keyHeight,
keyWidth,
autoHeight,
autoWidth,
unitWidth,
unitHeight
} = config;
const onlyHeight = ['tc', 'bc'].indexOf(selectedHandler) >= 0; const onlyHeight = ['tc', 'bc'].indexOf(selectedHandler) >= 0;
const onlyWidth = ['cl', 'cr'].indexOf(selectedHandler) >= 0; const onlyWidth = ['cl', 'cr'].indexOf(selectedHandler) >= 0;
const style = {}; const style = {};
@ -472,11 +479,11 @@ export default {
if (!onlyHeight) { if (!onlyHeight) {
const bodyw = canvas.getBody().offsetWidth; const bodyw = canvas.getBody().offsetWidth;
const width = rect.w < bodyw ? rect.w : bodyw; const width = rect.w < bodyw ? rect.w : bodyw;
style[keyWidth] = autoWidth ? 'auto' : `${width}px`; style[keyWidth] = autoWidth ? 'auto' : `${width}${unitWidth}`;
} }
if (!onlyWidth) { if (!onlyWidth) {
style[keyHeight] = autoHeight ? 'auto' : `${rect.h}px`; style[keyHeight] = autoHeight ? 'auto' : `${rect.h}${unitHeight}`;
} }
modelToStyle.addStyle({ ...style, en }, { avoidStore: !store }); modelToStyle.addStyle({ ...style, en }, { avoidStore: !store });

Loading…
Cancel
Save