Pull request #6326: REPORT-61301 布局推荐-mac设计器全屏时，固定布局/非固定布局的弹窗飘移

Merge in DESIGN/design from ~FANGLEI/design10.0:final/11.0 to final/11.0

* commit '29fa11b255a33dcb93591614a45b5848458168d4':
  REPORT-61301 布局推荐-mac设计器全屏时，固定布局/非固定布局的弹窗飘移

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());