瀏覽代碼

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!
Christopher Chedeau 5 年之前
父節點
當前提交
5853fba821
共有 1 個文件被更改,包括 6 次插入1 次删除
  1. 6 1
      src/actions/actionProperties.tsx

+ 6 - 1
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)}
       />