From 98624e683964a2d6e8a5eff6b6d5fec629c6aa9c Mon Sep 17 00:00:00 2001 From: renekton Date: Wed, 7 Aug 2024 19:40:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=AE=A1=E7=90=86/=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=A1=AB=E6=8A=A5=E5=B1=9E=E6=80=A7/=E8=B6=85?= =?UTF-8?q?=E7=BA=A7=E9=93=BE=E6=8E=A5/=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fine/theme/light/ui/FineMenuItemUI.java | 6 ++++-- .../com/fr/design/actions/server/ConnectionListAction.java | 1 - .../com/fr/design/actions/server/GlobalTableDataAction.java | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineMenuItemUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineMenuItemUI.java index 58237f59d9..4e47d1587e 100644 --- a/designer-base/src/main/java/com/fine/theme/light/ui/FineMenuItemUI.java +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineMenuItemUI.java @@ -1,8 +1,8 @@ package com.fine.theme.light.ui; +import com.fine.theme.icon.LazyIcon; import com.fine.theme.utils.FineClientProperties; import com.formdev.flatlaf.ui.FlatMenuItemUI; -import com.fr.design.editlock.EditLockUtils; import javax.swing.JComponent; import javax.swing.plaf.ComponentUI; @@ -35,7 +35,9 @@ public class FineMenuItemUI extends FlatMenuItemUI { Object itemType = c.getClientProperty(FineClientProperties.MENU_ITEM_TYPE); if (FineClientProperties.MENU_ITEM_TYPE_LOCK.equals(itemType)) { - g.drawImage(EditLockUtils.LOCKED_IMAGE, c.getWidth() - rightMargin - iconSize, (c.getHeight() - iconSize) / 2, iconSize, iconSize, null); + LazyIcon icon = new LazyIcon("locked"); + + icon.paintIcon(c, g, c.getWidth() - rightMargin - iconSize, (c.getHeight() - iconSize) / 2); } } } diff --git a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java index 98094873c3..216d7dd8ad 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java @@ -1,7 +1,6 @@ package com.fr.design.actions.server; import com.fine.theme.icon.LazyIcon; -import com.fine.theme.utils.FineClientProperties; import com.fr.data.impl.Connection; import com.fr.design.actions.UpdateAction; import com.fr.design.data.datapane.connect.ConnectionShowPane; diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java index 90b65ecc1a..c2c6d64b79 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java @@ -4,7 +4,6 @@ package com.fr.design.actions.server; import com.fine.theme.icon.LazyIcon; -import com.fine.theme.utils.FineClientProperties; import com.fr.base.TableData; import com.fr.design.DesignModelAdapter; import com.fr.design.actions.UpdateAction;