Browse Source

无jira任务,sonar问题修复

research/11.0
author 5 years ago
parent
commit
3167f4339a
  1. 3
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardAddButton.java
  2. 4
      designer-form/src/main/java/com/fr/design/form/layout/FRTitleLayout.java
  3. 2
      designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

3
designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardAddButton.java

@ -92,6 +92,9 @@ public class XCardAddButton extends XButton {
if(cardLayout == null && tagLayout ==null ){
initRelateLayout();
}
if (cardLayout == null) {
throw new IllegalArgumentException("cardLayout can not be null");
}
int index = cardLayout.toData().getWidgetCount();
//添加新的tab,并将原来的设为未选中状态

4
designer-form/src/main/java/com/fr/design/form/layout/FRTitleLayout.java

@ -126,9 +126,9 @@ public class FRTitleLayout implements FRLayoutManager, LayoutManager{
int titleH = title==null ? 0 : WTitleLayout.TITLE_HEIGHT;
for (int i=0; i< target.getComponentCount(); i++) {
Component comp = target.getComponent(i);
if (comp == title) {
if (comp != null && comp == title) {
comp.setBounds(0, 0, width, WTitleLayout.TITLE_HEIGHT);
} else if (comp == body) {
} else if (comp != null && comp == body) {
int y = titleH+gap;
comp.setBounds(0, y, width, height-y);
}

2
designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

@ -573,8 +573,8 @@ public class EditingMouseListener extends MouseInputAdapter {
GUICoreUtils.showPopupMenu(cellPopupMenu, designer, e.getX(), e.getY());
}
}
creator.doLayout();
}
creator.doLayout();
LayoutUtils.layoutRootContainer(designer.getRootComponent());
}

Loading…
Cancel
Save