From 11dc3aa58788b2e901bd206f91ee923f444d9df2 Mon Sep 17 00:00:00 2001 From: kuangshuai Date: Fri, 8 Oct 2021 20:58:03 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-60489=20=E4=B8=BB=E9=A2=98=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=BC=B9=E7=AA=97=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9&&=E8=A7=A3=E5=86=B3=E9=95=BF=E6=8C=89?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=BA=95=E9=83=A8dialog=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=9C=A8=E6=9C=80=E4=B8=8A=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/guide/scene/ClickScene.java | 7 +++++++ .../mainframe/guide/creator/theme/ThemeToggleGuide.java | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/ClickScene.java b/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/ClickScene.java index 234783fa4..735b00736 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/ClickScene.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/ClickScene.java @@ -2,6 +2,9 @@ package com.fr.design.mainframe.guide.scene; import com.fr.design.mainframe.guide.base.GuideManager; +import javax.swing.AbstractButton; +import javax.swing.ButtonModel; +import javax.swing.SwingUtilities; import java.awt.Component; import java.awt.Point; import java.awt.Rectangle; @@ -71,6 +74,10 @@ public class ClickScene extends AbstractGuideScene{ @Override public void mousePressed(MouseEvent e) { if (isDispatch) { + if (target instanceof AbstractButton) { + AbstractButton b = (AbstractButton) target; + b.setFocusable(false); + } redispatchMouseEvent(e, target); } } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java index ae9616743..1d573cf2b 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java @@ -11,7 +11,6 @@ import com.fr.design.mainframe.CenterRegionContainerPane; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.design.mainframe.EastRegionContainerPane; -import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.design.mainframe.guide.GuideIds; import com.fr.design.mainframe.guide.base.Guide; import com.fr.design.mainframe.guide.base.GuideBuilder; @@ -30,9 +29,6 @@ import com.fr.design.utils.ComponentUtils; import javax.swing.SwingUtilities; import java.awt.Component; -import java.awt.Point; -import java.awt.Rectangle; -import java.util.Timer; import java.util.TimerTask; public class ThemeToggleGuide { @@ -141,7 +137,7 @@ public class ThemeToggleGuide { @Override public boolean prepared() { scene.addClickTarget(ComponentUtils.findComponentByName(themeDialog, TemplateThemeUsingDialog.COMPLETE_BUTTON), ClickScene.ClickType.LEFT, true); - scene.addBubbleTip(Toolkit.i18nText("Fine-Design_Guide_Scene_Base_Tip_Click_Confirm"), BubbleTip.Direction.TOP); + scene.addBubbleTip(Toolkit.i18nText("Fine-Design_Guide_Scene_Base_Tip_Click_Complete"), BubbleTip.Direction.TOP); return true; }