REPORT-6258 tab标签右击时原本的移动功能被覆盖了=>调整代码

designer_base/src/com/fr/design/gui/imenu/UIPopupMenu.java

@@ -10,6 +10,7 @@ import com.fr.design.constants.UIConstants;
 public class UIPopupMenu extends JPopupMenu{
 	private static final float REC = 8f;
 	private boolean onlyText = false;
+	public static UIPopupMenu EMPTY = new UIPopupMenu();
 	public UIPopupMenu() {
 		super();
 		setBackground(UIConstants.NORMAL_BACKGROUND);

designer_form/src/com/fr/design/designer/creator/XCreator.java

@@ -688,9 +688,9 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	 * 创建右击弹出菜单
 	 *
 	 */
-	public JPopupMenu createPopupMenu(FormDesigner formDesigner) {
+	public UIPopupMenu createPopupMenu(FormDesigner formDesigner) {
         UpdateAction[] actions = formDesigner.getActions();
-		JPopupMenu popup = new UIPopupMenu();
+		UIPopupMenu popup = new UIPopupMenu();
         for (int i = 0; i < actions.length; i++) {
             if (i == SHORTS_SEPARATOR_POS) {
                 popup.addSeparator();

designer_form/src/com/fr/design/designer/creator/cardlayout/XCardAddButton.java

@@ -1,13 +1,5 @@
 package com.fr.design.designer.creator.cardlayout;
 
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.event.MouseEvent;
-
-import javax.swing.*;
-
 import com.fr.base.BaseUtils;
 import com.fr.base.background.ColorBackground;
 import com.fr.design.designer.beans.AdapterBus;
@@ -15,6 +7,7 @@ import com.fr.design.designer.beans.ComponentAdapter;
 import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.designer.creator.XButton;
 import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormHierarchyTreePane;
@@ -25,6 +18,10 @@ import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.MouseEvent;
+
 public class XCardAddButton extends XButton{
 	
 	private XWCardTagLayout tagLayout;
@@ -112,8 +109,8 @@ public class XCardAddButton extends XButton{
     }
 
 	@Override
-	public JPopupMenu createPopupMenu(FormDesigner formDesigner) {
-		return null;  // 不要菜单
+	public UIPopupMenu createPopupMenu(FormDesigner formDesigner) {
+		return UIPopupMenu.EMPTY;  // 不要菜单
 	}
     
     private void initRelateLayout(){

designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java

@@ -14,6 +14,7 @@ import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormHierarchyTreePane;
@@ -32,19 +33,9 @@ import com.fr.general.FRFont;
 import com.fr.general.Inter;
 import com.fr.stable.unit.PT;
 
-import javax.swing.Action;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
 import javax.swing.plaf.basic.BasicLabelUI;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
+import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
@@ -225,8 +216,8 @@ public class XCardSwitchButton extends XButton {
 	}
 
 	@Override
-	public JPopupMenu createPopupMenu(FormDesigner formDesigner) {
-		return null;  // 自己有一个showPopupMenu，不需要使用通用的弹出菜单
+	public UIPopupMenu createPopupMenu(FormDesigner formDesigner) {
+		return UIPopupMenu.EMPTY;  // 自己有一个showPopupMenu，不需要使用通用的弹出菜单
 	}
 
 	//删除card，同时修改其他switchbutton和tabfit的index

designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java

@@ -3,18 +3,6 @@
  */
 package com.fr.design.designer.creator.cardlayout;
 
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Rectangle;
-import java.awt.event.ContainerEvent;
-import java.awt.event.MouseEvent;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.*;
-import javax.swing.border.Border;
-
 import com.fr.base.GraphHelper;
 import com.fr.base.ScreenResolution;
 import com.fr.design.designer.beans.AdapterBus;
@@ -23,15 +11,12 @@ import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRHorizontalLayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRVerticalLayoutAdapter;
 import com.fr.design.designer.beans.models.SelectionModel;
-import com.fr.design.designer.creator.XCreator;
-import com.fr.design.designer.creator.XCreatorUtils;
-import com.fr.design.designer.creator.XLayoutContainer;
-import com.fr.design.designer.creator.XWHorizontalBoxLayout;
-import com.fr.design.designer.creator.XWidgetCreator;
+import com.fr.design.designer.creator.*;
 import com.fr.design.form.layout.FRFlowLayout;
 import com.fr.design.form.layout.FRHorizontalLayout;
 import com.fr.design.form.layout.FRVerticalLayout;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.WidgetPropertyPane;
@@ -44,6 +29,13 @@ import com.fr.form.ui.container.cardlayout.WTabFitLayout;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
 
+import javax.swing.border.Border;
+import java.awt.*;
+import java.awt.event.ContainerEvent;
+import java.awt.event.MouseEvent;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @date: 2014-11-25-下午3:11:14
  */
@@ -244,8 +236,8 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
     }
 
     @Override
-    public JPopupMenu createPopupMenu(FormDesigner formDesigner) {
-        return null;  // 不要菜单
+    public UIPopupMenu createPopupMenu(FormDesigner formDesigner) {
+        return UIPopupMenu.EMPTY;  // 不要菜单
     }
 
     @Override

designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java

@@ -11,29 +11,24 @@ import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.fun.WidgetPropertyUIProvider;
+import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormHierarchyTreePane;
 import com.fr.design.mainframe.widget.editors.ButtonTypeEditor;
 import com.fr.design.mainframe.widget.editors.ImgBackgroundEditor;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.CardSwitchButton;
+import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
-import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.general.Background;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
-import javax.swing.*;
 import javax.swing.border.Border;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Rectangle;
+import java.awt.*;
 import java.beans.IntrospectionException;
 
 
@@ -105,8 +100,8 @@ public class XWTabFitLayout extends XWFitLayout {
 	}
 
 	@Override
-	public JPopupMenu createPopupMenu(FormDesigner formDesigner) {
-		return null;  // 不要菜单
+	public UIPopupMenu createPopupMenu(FormDesigner formDesigner) {
+		return UIPopupMenu.EMPTY;  // 不要菜单
 	}
 
 	/**

designer_form/src/com/fr/design/mainframe/EditingMouseListener.java

@@ -14,6 +14,7 @@ import com.fr.design.designer.creator.cardlayout.XCardSwitchButton;
 import com.fr.design.designer.creator.cardlayout.XWCardLayout;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.gui.xpane.ToolTipEditor;
 import com.fr.design.icon.IconPathConstants;
 import com.fr.design.utils.ComponentUtils;
@@ -540,8 +541,8 @@ public class EditingMouseListener extends MouseInputAdapter {
         if (creator != null) {
             creator.respondClick(this, e);
             if (e.getButton() == MouseEvent.BUTTON3) {
-                JPopupMenu cellPopupMenu = creator.createPopupMenu(designer);
-                if (cellPopupMenu != null) {
+                UIPopupMenu cellPopupMenu = creator.createPopupMenu(designer);
+                if (cellPopupMenu != UIPopupMenu.EMPTY) {
                     GUICoreUtils.showPopupMenu(cellPopupMenu, designer, e.getX(), e.getY());
                 }
             }