Browse Source

REPORT-6258 tab标签右击时原本的移动功能被覆盖了

plough 7 years ago
parent
commit
2bc81a3c5a
  1. 7
      designer_form/src/com/fr/design/designer/creator/cardlayout/XCardAddButton.java
  2. 5
      designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
  3. 6
      designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java
  4. 6
      designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java

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

@ -6,7 +6,7 @@ import java.awt.Graphics;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import javax.swing.Icon; import javax.swing.*;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.base.background.ColorBackground; import com.fr.base.background.ColorBackground;
@ -110,6 +110,11 @@ public class XCardAddButton extends XButton{
tagLayout.setTabsAndAdjust(); tagLayout.setTabsAndAdjust();
LayoutUtils.layoutRootContainer(designer.getRootComponent()); LayoutUtils.layoutRootContainer(designer.getRootComponent());
} }
@Override
public JPopupMenu createPopupMenu(FormDesigner formDesigner) {
return null; // 不要菜单
}
private void initRelateLayout(){ private void initRelateLayout(){
XWCardTitleLayout titleLayout = (XWCardTitleLayout)this.getBackupParent(); XWCardTitleLayout titleLayout = (XWCardTitleLayout)this.getBackupParent();

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

@ -224,6 +224,11 @@ public class XCardSwitchButton extends XButton {
GUICoreUtils.showPopupMenu(jPopupMenu, editingMouseListener.getDesigner(), e.getX(), e.getY()); GUICoreUtils.showPopupMenu(jPopupMenu, editingMouseListener.getDesigner(), e.getX(), e.getY());
} }
@Override
public JPopupMenu createPopupMenu(FormDesigner formDesigner) {
return null; // 自己有一个showPopupMenu,不需要使用通用的弹出菜单
}
//删除card,同时修改其他switchbutton和tabfit的index //删除card,同时修改其他switchbutton和tabfit的index
private void deleteCard(XCardSwitchButton button,int index){ private void deleteCard(XCardSwitchButton button,int index){
String titleName = button.getContentLabel().getText(); String titleName = button.getContentLabel().getText();

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

@ -12,6 +12,7 @@ import java.awt.event.MouseEvent;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.swing.*;
import javax.swing.border.Border; import javax.swing.border.Border;
import com.fr.base.GraphHelper; import com.fr.base.GraphHelper;
@ -242,6 +243,11 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
} }
} }
@Override
public JPopupMenu createPopupMenu(FormDesigner formDesigner) {
return null; // 不要菜单
}
@Override @Override
public int[] getDirections() { public int[] getDirections() {
return ((XCreator)getParent()).getDirections(); return ((XCreator)getParent()).getDirections();

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

@ -26,6 +26,7 @@ import com.fr.general.Inter;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
import com.fr.stable.core.PropertyChangeAdapter; import com.fr.stable.core.PropertyChangeAdapter;
import javax.swing.*;
import javax.swing.border.Border; import javax.swing.border.Border;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;
@ -103,6 +104,11 @@ public class XWTabFitLayout extends XWFitLayout {
super(widget, initSize); super(widget, initSize);
} }
@Override
public JPopupMenu createPopupMenu(FormDesigner formDesigner) {
return null; // 不要菜单
}
/** /**
* 得到属性名 * 得到属性名
* @return 属性名 * @return 属性名

Loading…
Cancel
Save