Compare commits

...

2 Commits

2 changed files with 10 additions and 5 deletions

View File

@@ -1587,17 +1587,21 @@ class App extends React.Component<AppProps, AppState> {
}
if (event.key === KEYS.G || event.key === KEYS.S) {
if (this.state.elementType === "selection") {
const selectedElements = getSelectedElements(
this.scene.getElements(),
this.state,
);
if (
this.state.elementType === "selection" &&
!selectedElements.length
) {
return;
}
if (
event.key === KEYS.G &&
(hasBackground(this.state.elementType) ||
getSelectedElements(
this.scene.getElements(),
this.state,
).some((element) => hasBackground(element.type)))
selectedElements.some((element) => hasBackground(element.type)))
) {
this.setState({ openPopup: "backgroundColorPicker" });
}

View File

@@ -207,6 +207,7 @@ export const renderScene = (
const context = canvas.getContext("2d")!;
context.resetTransform();
context.scale(scale, scale);
// When doing calculations based on canvas width we should used normalized one