From 27df4e1d74b4c818f2245a2ed29f7c9f79cb0897 Mon Sep 17 00:00:00 2001 From: hades Date: Sat, 8 May 2021 16:14:45 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-51315=20=E4=BF=9D=E5=AD=98=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=A0=87=E7=AD=BE=E7=9A=84?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E9=81=97=E6=BC=8F=E5=8A=A0=E8=BD=BD=E5=8A=A8?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/file/MutilTempalteTabPane.java | 9 +++++++++ .../fr/design/images/file/grey_saving_close.gif | Bin 0 -> 3430 bytes .../fr/design/images/file/white_saving_close.gif | Bin 0 -> 3488 bytes 3 files changed, 9 insertions(+) create mode 100644 designer-base/src/main/resources/com/fr/design/images/file/grey_saving_close.gif create mode 100644 designer-base/src/main/resources/com/fr/design/images/file/white_saving_close.gif diff --git a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java index 0e81485849..d2d77117fd 100644 --- a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java +++ b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java @@ -26,6 +26,7 @@ import com.fr.third.javax.annotation.Nonnull; import javax.swing.BorderFactory; import javax.swing.ButtonModel; import javax.swing.Icon; +import javax.swing.ImageIcon; import javax.swing.JComponent; import javax.swing.JMenu; import javax.swing.JMenuItem; @@ -69,6 +70,8 @@ public class MutilTempalteTabPane extends JComponent { private static Icon CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/close_icon.png"); private static Icon MOUSE_OVER_CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/mouseoverclose icon.png"); private static Icon MOUSE_PRESS_CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/pressclose icon.png"); + private static final Icon WHITE_SAVING_CLOSE_ICON = new ImageIcon(MutilTempalteTabPane.class.getResource("/com/fr/design/images/file/white_saving_close.gif")); + private static final Icon GREY_SAVING_CLOSE_ICON = new ImageIcon(MutilTempalteTabPane.class.getResource("/com/fr/design/images/file/grey_saving_close.gif")); private static final String ELLIPSIS = "..."; private static final int GAP = 5; private static final int SMALLGAP = 3; @@ -386,8 +389,14 @@ public class MutilTempalteTabPane extends JComponent { selectedIcon = CLOSE; } if (i == selectedIndex) { + if (template.isSaving()) { + selectedIcon = WHITE_SAVING_CLOSE_ICON; + } startX[i - minPaintIndex] = paintSelectedTab(g2d, icon, templateStartX, name, selectedIcon); } else { + if (template.isSaving()) { + selectedIcon = GREY_SAVING_CLOSE_ICON; + } boolean isLeft = i < selectedIndex; startX[i - minPaintIndex] = paintUnSelectedTab(g2d, icon, templateStartX, name, selectedIcon, isLeft, mouseOveredIndex, i); } diff --git a/designer-base/src/main/resources/com/fr/design/images/file/grey_saving_close.gif b/designer-base/src/main/resources/com/fr/design/images/file/grey_saving_close.gif new file mode 100644 index 0000000000000000000000000000000000000000..a3c061b0f190ad1bd5199898f5e61fb55e7966e1 GIT binary patch literal 3430 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 literal 0 HcmV?d00001