From 8bf59f2fe7b88115dc8e04d3946b8ecedaa79a2e Mon Sep 17 00:00:00 2001
From: xushengfeng <xushengfeng_zg@163.com>
Date: Sun, 11 Dec 2022 14:36:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=AA=E5=B1=8F=20=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9A=84=E7=94=BB=E7=AC=94=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/clip/clip_window.ts | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/renderer/clip/clip_window.ts b/src/renderer/clip/clip_window.ts
index 3e768ea89..dfab19af5 100644
--- a/src/renderer/clip/clip_window.ts
+++ b/src/renderer/clip/clip_window.ts
@@ -1886,7 +1886,7 @@ var mode: "free" | "eraser" | "spray";
 var pencil_el = <HTMLInputElement>document.getElementById("draw_free_pencil");
 pencil_el.oninput = () => {
     fabric_canvas.isDrawingMode = pencil_el.checked;
-    get_f_object_v();
+    free_init();
     if (pencil_el.checked) {
         free_i_els[1].checked = false;
         free_i_els[2].checked = false;
@@ -1904,7 +1904,7 @@ pencil_el.oninput = () => {
 var eraser_el = <HTMLInputElement>document.getElementById("draw_free_eraser");
 eraser_el.oninput = () => {
     fabric_canvas.isDrawingMode = eraser_el.checked;
-    get_f_object_v();
+    free_init();
     if (eraser_el.checked) {
         free_i_els[0].checked = false;
         free_i_els[2].checked = false;
@@ -1920,7 +1920,7 @@ eraser_el.oninput = () => {
 var free_spray_el = <HTMLInputElement>document.getElementById("draw_free_spray");
 free_spray_el.oninput = () => {
     fabric_canvas.isDrawingMode = free_spray_el.checked;
-    get_f_object_v();
+    free_init();
     if (free_spray_el.checked) {
         free_i_els[0].checked = false;
         free_i_els[1].checked = false;
@@ -1945,10 +1945,6 @@ function free_shadow() {
 }
 
 function free_draw_cursor() {
-    mode = "free";
-    if (pencil_el.checked) mode = "free";
-    if (eraser_el.checked) mode = "eraser";
-    if (free_spray_el.checked) mode = "spray";
     if (mode == "free" || mode == "eraser") {
         var svg_w = free_width,
             h_w = svg_w / 2,
@@ -1972,6 +1968,19 @@ function free_draw_cursor() {
     }
 }
 
+function free_init() {
+    mode = "free";
+    if (pencil_el.checked) mode = "free";
+    if (eraser_el.checked) mode = "eraser";
+    if (free_spray_el.checked) mode = "spray";
+    let sc = store.get(`图像编辑.形状属性.${mode}.sc`);
+    let sw = store.get(`图像编辑.形状属性.${mode}.sw`);
+    if (sc) free_color = sc;
+    if (sw) free_width = sw;
+    if (sc) change_color({ stroke: sc }, false, true);
+    if (sw) (<HTMLInputElement>document.querySelector("#draw_stroke_width > range-b")).value = sw;
+}
+
 // 几何
 var shape = "";
 document.getElementById("draw_shapes_i").onclick = (e) => {