From e6460ff3cf97e8c6faf216caeb211f91ee7e2858 Mon Sep 17 00:00:00 2001
From: kuangshuai <kuangshuai_ios@icloud.com>
Date: Mon, 11 Oct 2021 21:16:21 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-60477=20=E5=AE=8C=E6=88=90=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E7=9A=84=E6=8C=89=E9=92=AE=E6=9C=89=E9=87=8D=E5=BD=B1?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8UIButton=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../guide/ui/GuideCompleteDialog.java         | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/guide/ui/GuideCompleteDialog.java b/designer-base/src/main/java/com/fr/design/mainframe/guide/ui/GuideCompleteDialog.java
index 3da6beb5f..29316652d 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/guide/ui/GuideCompleteDialog.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/guide/ui/GuideCompleteDialog.java
@@ -1,15 +1,17 @@
 package com.fr.design.mainframe.guide.ui;
 
 import com.fr.design.gui.frpane.UITextPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UIButtonUI;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.general.IOUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
-import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
@@ -20,6 +22,7 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Container;
 import java.awt.Dimension;
+import java.awt.Graphics2D;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -83,13 +86,15 @@ public class GuideCompleteDialog extends JDialog {
         buttonContainer.setPreferredSize(new Dimension(190,38));
         buttonContainer.setOpaque(false);
 
-        JButton button = new JButton(Toolkit.i18nText("Fine-Design_Guide_Complete_End"));
-        button.setPreferredSize(new Dimension(122, 38));
-        button.setBackground(BUTTON_BG_COLOR);
+        UIButton button = new UIButton(Toolkit.i18nText("Fine-Design_Guide_Complete_End")){
+            @Override
+            public Dimension getPreferredSize() {
+                return new Dimension(122, 38);
+            }
+        };
+        button.setUI(confirmButtonUI);
+        button.setRoundBorder(true);
         button.setForeground(Color.WHITE);
-        button.setBorder(null);
-        button.setContentAreaFilled(false);
-        button.setOpaque(true);
         button.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -114,4 +119,16 @@ public class GuideCompleteDialog extends JDialog {
         repaint();
         this.setVisible(true);
     }
+
+    private UIButtonUI confirmButtonUI = new UIButtonUI() {
+        protected void doExtraPainting(UIButton b, Graphics2D g2d, int w, int h, String selectedRoles) {
+            if (isPressed(b) && b.isPressedPainted()) {
+                GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), BUTTON_BG_COLOR);
+            } else if (isRollOver(b)) {
+                GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), BUTTON_BG_COLOR);
+            } else if (b.isNormalPainted()) {
+                GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), BUTTON_BG_COLOR);
+            }
+        }
+    };
 }