diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/TabMoveAction.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/TabMoveAction.java index 008a41fab5..9b5dd26623 100644 --- a/designer_form/src/com/fr/design/designer/creator/cardlayout/TabMoveAction.java +++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/TabMoveAction.java @@ -2,6 +2,7 @@ package com.fr.design.designer.creator.cardlayout; import com.fr.design.designer.beans.actions.FormUndoableAction; import com.fr.design.mainframe.FormDesigner; +import com.fr.design.mainframe.FormHierarchyTreePane; import com.fr.form.ui.CardSwitchButton; import com.fr.form.ui.container.cardlayout.WTabFitLayout; import com.fr.general.FRLogger; @@ -36,6 +37,7 @@ public class TabMoveAction extends FormUndoableAction { xwCardTagLayout.setSwitchingTab(false); xwCardTagLayout.doLayout(); + FormHierarchyTreePane.getInstance().refreshDockingView(); }catch (Exception e){ xwCardTagLayout.setSwitchingTab(false); FRLogger.getLogger().error(e.getMessage()); diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java index fda713bcf3..fb9510d1a6 100644 --- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java @@ -16,11 +16,14 @@ import com.fr.design.designer.creator.XWidgetCreator; import com.fr.design.icon.IconPathConstants; import com.fr.design.mainframe.EditingMouseListener; import com.fr.design.mainframe.FormDesigner; +import com.fr.form.event.Listener; +import com.fr.form.ui.LayoutBorderStyle; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WTabDisplayPosition; +import com.fr.form.ui.container.WTitleLayout; import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout; import com.fr.form.ui.container.cardlayout.WCardTagLayout; import com.fr.form.ui.container.cardlayout.WCardTitleLayout; @@ -146,9 +149,23 @@ public class XWCardMainBorderLayout extends XWBorderLayout{ String tabpaneName = cardLayout.getWidgetName(); if (!wCardTagLayout.isNewTab()) { wCardTagLayout.setWidgetName(tabpaneName); + LayoutBorderStyle borderStyle = cardLayout.getBorderStyle(); + if(borderStyle != null){ + //新tab默认都有标题 + borderStyle.setType(LayoutBorderStyle.TITLE); + } cardLayout.setWidgetName(XWCardLayout.DEFAULT_NAME + tabpaneName.replaceAll(XWCardTagLayout.DEFAULT_NAME, "")); + wCardTitleLayout.setCardName(cardLayout.getWidgetName()); wCardTagLayout.setNewTab(true); - wCardTagLayout.setNewTab(true); + //这边需要设置成默认值兼容之前的title高度(不知道为啥之前的title的高度会改变) + ob.setNorthSize(WTitleLayout.TITLE_HEIGHT); + for(int i = 0 ;i < cardLayout.getListenerSize(); i ++){ + Listener listener = cardLayout.getListener(i); + if(listener != null){ + wCardTagLayout.addListener(listener); + } + } + cardLayout.clearListeners(); } } diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java index 179864bd57..7dc69ba5d6 100644 --- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java @@ -21,7 +21,9 @@ import com.fr.design.mainframe.EditingMouseListener; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.form.ui.CardSwitchButton; +import com.fr.form.ui.LayoutBorderStyle; import com.fr.form.ui.Widget; +import com.fr.form.ui.WidgetTitle; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WTabDisplayPosition; import com.fr.form.ui.container.cardlayout.WCardTagLayout; @@ -55,7 +57,7 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout { private static final int HEIGHT_SIDE_OFFSET = 20; - private static final int DEFAULT_BUTTON_HEIGHT = 40; + private static final int DEFAULT_VERTICAL_SPACING = 3; public static final String DEFAULT_NAME = "tabpane"; @@ -323,41 +325,46 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout { } public void setTabsAndAdjust() { - WCardTagLayout wCardTagLayout = (WCardTagLayout)this.toData(); + WCardTagLayout wCardTagLayout = (WCardTagLayout) this.toData(); int tabLength = this.getComponentCount(); Map cardWidth = new HashMap(); Map cardHeight = new HashMap(); - XLayoutContainer parent = this.getBackupParent(); + XLayoutContainer parent = this.getBackupParent(); for (int i = 0; i < tabLength; i++) { XCardSwitchButton temp = (XCardSwitchButton) this.getComponent(i); CardSwitchButton tempCard = (CardSwitchButton) temp.toData(); String tempText = tempCard.getText(); - Font f = tempCard.getFont(); + if (this.cardLayout == null) { + initCardLayout(); + } + LayoutBorderStyle borderStyle = this.cardLayout.toData().getBorderStyle(); + WidgetTitle title = borderStyle.getTitle(); + FRFont f = title.getFrFont(); FontMetrics fm = GraphHelper.getFontMetrics(f); - switch (wCardTagLayout.getTextDirection()){ + switch (wCardTagLayout.getTextDirection()) { case TEXT_HORI_DERECTION: - cardWidth.put(i,fm.stringWidth(tempText)); - cardHeight.put(i,fm.getHeight()); + cardWidth.put(i, fm.stringWidth(tempText)); + cardHeight.put(i, fm.getHeight()); break; case TEXT_VER_DIRECTION: int perHeight = fm.getHeight(); int wordCount = tempText.length(); - if(tempText.length() !=0 ){ - cardWidth.put(i,fm.stringWidth(tempText)/tempText.length()); - }else { + if (tempText.length() != 0) { + cardWidth.put(i, fm.stringWidth(tempText) / tempText.length()); + } else { cardWidth.put(i, 0); } - cardHeight.put(i,(perHeight+3)*wordCount); + cardHeight.put(i, (perHeight + DEFAULT_VERTICAL_SPACING) * wordCount); break; default: break; } } - if(isHori()){ + if (isHori()) { adjustTabsH(parent, tabLength, cardWidth, cardHeight); - }else { + } else { adjustTabsV(parent, tabLength, cardWidth, cardHeight); } fixTitleLayout(parent); diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardMainLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardMainLayoutDefinePane.java index ffafb9e87f..68e88bb6b7 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardMainLayoutDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardMainLayoutDefinePane.java @@ -78,7 +78,7 @@ public class WCardMainLayoutDefinePane extends AbstractDataModify