From 282242695a04a316e8d54a10d57f962da9db991c Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Tue, 26 Apr 2022 10:06:24 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-70475=20=E6=96=B0=E6=97=A7fm=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=20=E6=82=AC=E6=B5=AE=E6=8C=89=E9=92=AE=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alphafine/question/QuestionPane.java        |  9 +--------
 .../alphafine/question/QuestionWindow.java      | 17 +++--------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/question/QuestionPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/question/QuestionPane.java
index 34075a696..8c593e213 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/question/QuestionPane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/question/QuestionPane.java
@@ -23,12 +23,8 @@ public class QuestionPane extends JPanel {
 
     private static final Image QUESTION_BACKGROUND_IMAGE = SVGLoader.load("/com/fr/design/mainframe/alphafine/images/groupbackgroud.svg");
 
-    /**
-     * 是否全部已读
-     */
-    private boolean hasRead;
 
-    public QuestionPane(boolean hasRead) {
+    public QuestionPane() {
         this.setBackground(new Color(0, 0, 0, 0));
     }
 
@@ -47,9 +43,6 @@ public class QuestionPane extends JPanel {
 
     }
 
-    public void setHasRead(boolean hasRead) {
-        this.hasRead = hasRead;
-    }
 
     @Override
     public Dimension getPreferredSize() {
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/question/QuestionWindow.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/question/QuestionWindow.java
index 9b7cff7d6..00e8a8f3e 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/question/QuestionWindow.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/question/QuestionWindow.java
@@ -20,7 +20,7 @@ import javax.swing.JWindow;
 public class QuestionWindow extends JWindow {
 
     private static final QuestionWindow INSTANCE = new QuestionWindow();
-    private final QuestionPane questionPane = new QuestionPane(true);
+    private final QuestionPane questionPane = new QuestionPane();
     private int pressX;
     private int pressY;
     private QuestionWindow() {
@@ -62,6 +62,8 @@ public class QuestionWindow extends JWindow {
         this.getLayeredPane().setToolTipText(Toolkit.i18nText("Fine-Design_Report_AlphaFine_Learn_More_About"));
         this.setContentPane(questionPane);
         this.setSize(new Dimension(40, 40));
+        // 这个地方可以设置alwaysOnTop  弹窗会跟随主页面失去激活状态而隐藏 不会与其他弹窗冲突
+        this.setAlwaysOnTop(true);
         this.setLocation(DesignerContext.getDesignerFrame().getWidth() - 100,
                          DesignerContext.getDesignerFrame().getHeight() - 100);
     }
@@ -70,17 +72,4 @@ public class QuestionWindow extends JWindow {
         return INSTANCE;
     }
 
-    public void setHasRead(boolean hasRead) {
-        this.questionPane.setHasRead(hasRead);
-    }
-
-    @Override
-    public void setVisible(boolean b) {
-        super.setVisible(b);
-    }
-
-    @Override
-    public void dispose() {
-        super.dispose();
-    }
 }