From 5853fba8219c78adc39509a373098cf6239fe65c Mon Sep 17 00:00:00 2001 From: Christopher Chedeau Date: Sun, 26 Jan 2020 19:09:11 +0000 Subject: [PATCH] Fix global settings (#572) Some PR made the settings UI show up even though nothing is selected. However, you couldn't actually change any of those settings except for the colors. This PR pipes through the rest of the properties so everything works now! --- src/actions/actionProperties.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/actions/actionProperties.tsx b/src/actions/actionProperties.tsx index 2a482703..6e6af7af 100644 --- a/src/actions/actionProperties.tsx +++ b/src/actions/actionProperties.tsx @@ -120,6 +120,7 @@ export const actionChangeFillStyle: Action = { appState.editingElement, elements, element => element.fillStyle, + appState.currentItemFillStyle, )} onChange={value => { updateData(value); @@ -155,6 +156,7 @@ export const actionChangeStrokeWidth: Action = { appState.editingElement, elements, element => element.strokeWidth, + appState.currentItemStrokeWidth, )} onChange={value => updateData(value)} /> @@ -188,6 +190,7 @@ export const actionChangeSloppiness: Action = { appState.editingElement, elements, element => element.roughness, + appState.currentItemRoughness, )} onChange={value => updateData(value)} /> @@ -220,7 +223,7 @@ export const actionChangeOpacity: Action = { appState.editingElement, elements, element => element.opacity, - 100 /* default opacity */, + appState.currentItemOpacity, ) ?? undefined } /> @@ -268,6 +271,7 @@ export const actionChangeFontSize: Action = { appState.editingElement, elements, element => isTextElement(element) && +element.font.split("px ")[0], + +(appState.currentItemFont || "20px Virgil").split("px ")[0], )} onChange={value => updateData(value)} /> @@ -314,6 +318,7 @@ export const actionChangeFontFamily: Action = { appState.editingElement, elements, element => isTextElement(element) && element.font.split("px ")[1], + (appState.currentItemFont || "20px Virgil").split("px ")[1], )} onChange={value => updateData(value)} />