From e10d823db90dea0b3ce84b7b1aa6001834c99bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Fri, 22 Oct 2021 16:41:17 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-61301=20=E5=B8=83=E5=B1=80=E6=8E=A8?=
 =?UTF-8?q?=E8=8D=90-mac=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=85=A8=E5=B1=8F?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=9B=BA=E5=AE=9A=E5=B8=83=E5=B1=80/?=
 =?UTF-8?q?=E9=9D=9E=E5=9B=BA=E5=AE=9A=E5=B8=83=E5=B1=80=E7=9A=84=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E9=A3=98=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/mainframe/FormArea.java   | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java b/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java
index e08c1c652d..b3e35873f3 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java
@@ -1,6 +1,5 @@
 package com.fr.design.mainframe;
 
-import com.fr.common.inputevent.InputEventBaseOnOS;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.beans.events.DesignerEvent;
@@ -11,23 +10,22 @@ import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.fit.DesignerUIModeConfig;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIButtonUI;
-import com.fr.design.gui.imenu.UIPopupMenu;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.share.ui.base.PopupMenuItem;
-import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.design.utils.gui.GUIPaintUtils;
-import com.fr.form.fit.NewFormMarkAttr;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.gui.itextfield.UINumberField;
+import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.share.ui.base.PopupMenuItem;
 import com.fr.design.scrollruler.BaseRuler;
 import com.fr.design.scrollruler.HorizontalRuler;
 import com.fr.design.scrollruler.RulerLayout;
 import com.fr.design.scrollruler.ScrollRulerComponent;
 import com.fr.design.scrollruler.VerticalRuler;
 import com.fr.design.utils.ComponentUtils;
+import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.design.utils.gui.LayoutUtils;
+import com.fr.form.fit.NewFormMarkAttr;
 import com.fr.form.main.mobile.FormMobileAttr;
 import com.fr.form.ui.container.WBodyLayoutType;
 import com.fr.form.ui.container.WBorderLayout;
@@ -35,7 +33,6 @@ import com.fr.form.ui.container.WFitLayout;
 import com.fr.general.IOUtils;
 import com.fr.stable.AssistUtils;
 
-
 import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.BorderFactory;
@@ -65,7 +62,6 @@ import java.awt.event.FocusEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
 
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
@@ -214,7 +210,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         button.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                GUICoreUtils.showPopupMenu(popupMenu, fixLayoutSwitchButton, 0, -59);
+                popupMenu.show(fixLayoutSwitchButton, 0, -59);
             }
         });
         button.setVisible(!isAbsoluteBodyLayout());