From a064c43c9722865c344a4ab2a1db14478a4cf14d Mon Sep 17 00:00:00 2001
From: kuangshuai <kuangshuai_ios@icloud.com>
Date: Sun, 10 Oct 2021 18:48:26 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-60488=20=E8=A7=86=E8=A7=89=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/guide/base/GuideView.java |   2 +-
 .../guide/ui/bubble/BubbleWithClose.java       |   6 ++++--
 .../mainframe/guide/utils/ScreenImage.java     |   2 +-
 .../com/fr/design/mainframe/guide/close.png    | Bin 375 -> 1176 bytes
 .../guide/creator/GuideCreateUtils.java        |   4 +++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/guide/base/GuideView.java b/designer-base/src/main/java/com/fr/design/mainframe/guide/base/GuideView.java
index 53e18ffd7..d6ff17cbc 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/guide/base/GuideView.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/guide/base/GuideView.java
@@ -37,7 +37,7 @@ public class GuideView extends JDialog {
         this.setUndecorated(true);
         this.window = window;
         this.modalColor = Color.BLACK;
-        this.modalOpacity = 0.4f;
+        this.modalOpacity = 0.6f;
         this.setPreferredSize(window.getSize());
         this.setSize(window.getSize());
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/guide/ui/bubble/BubbleWithClose.java b/designer-base/src/main/java/com/fr/design/mainframe/guide/ui/bubble/BubbleWithClose.java
index 9894e5c93..ba8f3da05 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/guide/ui/bubble/BubbleWithClose.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/guide/ui/bubble/BubbleWithClose.java
@@ -7,6 +7,7 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.general.IOUtils;
 import com.fr.stable.StringUtils;
 
+import javax.swing.Icon;
 import javax.swing.JTextPane;
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
@@ -32,6 +33,7 @@ import java.text.AttributedString;
 
 public class BubbleWithClose extends Bubble {
     private static final Font FONT = new Font(Font.SANS_SERIF, Font.PLAIN, 14);
+    private static final Icon ICON = IOUtils.readIcon("/com/fr/design/mainframe/guide/close.png");
     private static final int HEADER_HEIGHT = 24;
     private static final Color HEADER_COLOR = new Color(245, 245, 246);
     private static final Color TITLE_COLOR = new Color(51, 51, 52);
@@ -112,9 +114,9 @@ public class BubbleWithClose extends Bubble {
 
     private void createCloseButton() {
         closeButton = new UIButton();
-        closeButton.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/guide/close.png"));
+        closeButton.setIcon(ICON);
         closeButton.set4ToolbarButton();
-        closeButton.setPreferredSize(new Dimension(16, 16));
+        closeButton.setPreferredSize(new Dimension(12, 12));
         closeButton.setRolloverEnabled(false);
         closeButton.setPressedPainted(false);
         this.add(closeButton);
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/guide/utils/ScreenImage.java b/designer-base/src/main/java/com/fr/design/mainframe/guide/utils/ScreenImage.java
index 3d718ec1c..8705d0e8a 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/guide/utils/ScreenImage.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/guide/utils/ScreenImage.java
@@ -61,7 +61,7 @@ public class ScreenImage {
         BufferedImage image = new BufferedImage(region.width, region.height, BufferedImage.TYPE_INT_RGB);
         Graphics2D g2d = image.createGraphics();
         g2d.drawImage(createImage(component), 0, 0, null);
-        g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.4f));
+        g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.6f));
         g2d.setColor(Color.BLACK);
         g2d.fillRect(0, 0, region.width, region.height);
         g2d.dispose();
diff --git a/designer-base/src/main/resources/com/fr/design/mainframe/guide/close.png b/designer-base/src/main/resources/com/fr/design/mainframe/guide/close.png
index 22e3caa538957be586f638a6ede20a45f4bc1e17..6f17a8e1c7822e1bf7aedd25fa776da2f6bbb05b 100644
GIT binary patch
literal 1176
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmUKs7M+SzC{oH>NS%LhD)CkWs
zUtb0-Ae)1Ml~IU+8OUM;LIy@D29OFMi@}Rg8qN-4)PSmCVqj>`WMF}+i2~9f-~q%S
zJrJ5{0TWyW&jMxy8>DpoKlwL6inG8YvY3H^TNs2H8D`CqU|?Xf$P9@niSYHYO3u&K
zOH9d6O4X~#Edc3au&J;DGILW)5)~?PbMlI<Dr}X&Dy)EPkg&dz0$52&wyjcxZ-9bx
zeo?A|sh)|Rfs!4Uf`WogQA(Oskc%5sJCJ9qlu=SrV5P5LUS6(OZmgGIl&)`RX=$l%
zV5DzkqzhD`TU?n}l31aeSF8*%1ZIv)YH@N=W<g12ex3rz+{C2((h^%GC6GmM0C8tY
zW*Wk#yke-gfF9Hb$><yE8R%ovmRgaCLmNm2q7CdXh;=p~!>s&^GE;#L206>l&<1P)
ziWtIq5cNT+#rZj<AmyQXnI(2cP%UV}NV-6FTLolRq~=7pWag&k6@zUuvC+pWfmLH9
zE{#YMP>nYFps+;>Ye+<bMS(GC$7Q1rPZf4tFBq@$0aIa-r;B5VhG=i#?w~^f0=`B0
zaxeT{CM76~ox2bm@k1fSO>6BBPSvuIPa6ty4mKUT#je3@!PEMWvG-up`V$5%D))pP
zHWc2OX<eQE{mr|Zn`89KcV*AICV9NjraH!I?y?UXw%YUaY&cZ%>RmwKF8dQR!np$&
z9z0_0P-N%XaHP<#ebus)MxwdC*QZvk{kCk?Du#r`7eDkHrFkap>@?TizinQ=U_Vdi
zno=RT)J<1Ib)x4UKXb{*&A@8@`QjIABs+b*PE^L2C%Gk6$1nMk^o;%bn$58~Vun-y
zM3opwoZ;&~Yb4mhWcAB2AalRT+ozvSxW`O?{O_@{*BWPo_zSDLrWi=osq!4=cU#FY
zYj56i=38e@_+Q>XeOs9KX0CZJWjxJ4+p682Q>-=h(R?}iU4^mzo=RJ{&v+8wcUgVM
z0-clQ7k1vwigW7ySaD|ey3@_aV)tIV{Akyr6J5D4+MFkyw7vIP?R~bpVnDO#!&5AE
hCPlv(ye}R5Abn!Zs<l7-^e=<*si&)-%Q~loCIG=MhWr2k

literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006O%
z3;baP0003lNkl<ZI1!ywJ!`^H6wQ5p&`=%gKL`XmcG96lw?YVH@K-tnvbZU9>6EdM
zj9n{Et)!^U^PML*MDry+2={UCIp==l-Hw!!q9}4~+ukNgvNvuxp63lM%bF<s7rCzM
z9RKCoFzAy8=5)DOY??IQ=JO}{n<~6~?sjM@)QLcb0|5Z)1d3#Ez!hN_{vdOk$Tb-p
z&E;%W0B)x#Ml1kZ1%#h_uA0+@KuLrshR=}Ft|B8;5`a@zvP<93M4%|9NAs0i0)~&^
z%e}TFkk0{SqXm5GUiXVH1ah)^6S`+rHcH36?w#Z_D3J@VvMHtongBeTIt*bk_J`~P
zCF-&ZnVHPi_x(}&cUUpD-xFhzW!Vcm+LkE@f^YMoH{+RTF4h?viAp$An*|mea8FAu
V?~Ga{m3jaG002ovPDHLkV1l-SoumK&

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/GuideCreateUtils.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/GuideCreateUtils.java
index a81f9df0f..7850e2f64 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/GuideCreateUtils.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/GuideCreateUtils.java
@@ -168,7 +168,9 @@ public class GuideCreateUtils {
     }
 
     public static void deleteGuideFile(String filePath) {
-        WorkContext.getWorkResource().delete(filePath);
+        if (filePath != null) {
+            WorkContext.getWorkResource().delete(filePath);
+        }
     }
 
     public static void showDialogWithoutModal(JDialog dialog) {