From 7026cd45683e9f84e6ec4da025c3d2baff6acbde Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 15 Apr 2021 19:28:03 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-49986=20=E3=80=9010.0.16=E3=80=91?=
 =?UTF-8?q?=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96=E4=B9=8B=E9=98=BB=E5=A1=9E?=
 =?UTF-8?q?EDT=E7=BA=BF=E7=A8=8B=E6=97=B6=E4=BC=98=E5=8C=96=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/gui/ibutton/UISaveForbiddenButton.java | 12 ++++++++++++
 .../design/gui/ibutton/UISaveForbiddenButtonUI.java  |  9 +--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UISaveForbiddenButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UISaveForbiddenButton.java
index 7e55c1b35e..7d65df421d 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UISaveForbiddenButton.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UISaveForbiddenButton.java
@@ -1,5 +1,7 @@
 package com.fr.design.gui.ibutton;
 
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.mainframe.JTemplate;
 import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.plaf.ButtonUI;
@@ -37,6 +39,16 @@ public class UISaveForbiddenButton extends UIButton {
         super(resource, needSetDisabledIcon);
     }
 
+    @Override
+    public boolean isEnabled() {
+        JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        boolean enabled = true;
+        if (template != null) {
+            enabled = !template.isSaving();
+        }
+        return enabled;
+    }
+
     @Override
     public ButtonUI getUI() {
         return new UISaveForbiddenButtonUI();
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UISaveForbiddenButtonUI.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UISaveForbiddenButtonUI.java
index 7a830c39fd..47be051248 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UISaveForbiddenButtonUI.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UISaveForbiddenButtonUI.java
@@ -1,7 +1,5 @@
 package com.fr.design.gui.ibutton;
 
-import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.design.mainframe.JTemplate;
 import java.awt.Graphics;
 import javax.swing.JComponent;
 
@@ -15,11 +13,6 @@ public class UISaveForbiddenButtonUI extends UIButtonUI {
     @Override
     public void paint(Graphics g, JComponent c) {
         super.paint(g, c);
-        JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        boolean flag = true;
-        if (template != null) {
-            flag = !template.isSaving();
-        }
-        c.setEnabled(flag);
+        c.setEnabled(c.isEnabled());
     }
 }