merge

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

@@ -10,8 +10,6 @@ import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
 import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
-import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer;
-import com.fr.design.mainframe.widget.renderer.PaddingMarginCellRenderer;
 import com.fr.design.parameter.ParameterBridge;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WLayout;
@@ -81,6 +79,27 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
                     };
 	}
 
+    /**
+     * 控件名属性
+     * @return
+     * @throws IntrospectionException
+     */
+    public CRPropertyDescriptor createWidgetNameDescriptor() throws IntrospectionException {
+        return new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
+                .getLocText("FR-Designer_Form-Widget_Name"));
+    }
+
+    /**
+     * 边距属性
+     * @return
+     * @throws IntrospectionException
+     */
+    public CRPropertyDescriptor createMarginDescriptor() throws IntrospectionException {
+        return new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
+                .setI18NName(Inter.getLocText("FR-Designer_Layout-Padding"))
+                .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced");
+    }
+
     /**
      *   返回对应的wlayout
      * @return wlayout控件

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

@@ -6,8 +6,7 @@ package com.fr.design.designer.creator.cardlayout;
 import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Rectangle2D;
-import java.util.HashMap;
+import java.util.*;
-import java.util.Map;
 
 import javax.swing.*;
 
@@ -58,6 +57,9 @@ public class XCardSwitchButton extends XButton {
 	private static final int RIGHT_OFFSET = 15;
 	private static final int TOP_OFFSET = 25;
 
+	//这边先不计算button的高度,涉及到layout那边的整体高度,先用之前的固定高度
+	private static final int DEFAULT_BUTTON_HEIGHT = 36;
+
 	// tab按钮里的字体因为按钮内部的布局看起来比正常的要小，加个调整量
 	private static final int FONT_SIZE_ADJUST = 2;
 
@@ -70,7 +72,6 @@ public class XCardSwitchButton extends XButton {
 	private Background selectBackground;
 	private boolean isCustomStyle;
 
-
 	private Icon closeIcon = MOUSE_COLSE;
 	
 	public XWCardTagLayout getTagLayout() {
@@ -169,6 +170,7 @@ public class XCardSwitchButton extends XButton {
 			editingMouseListener.startEditing(this,
 					adapter.getDesignerEditor(), adapter);
 		}
+		setTabsAndAdjust();
 	}
 	
 	//删除card，同时修改其他switchbutton和tabfit的index
@@ -258,6 +260,7 @@ public class XCardSwitchButton extends XButton {
 	
     public void paintComponent(Graphics g) {
         super.paintComponent(g);
+		setTabsAndAdjust();
         Graphics2D g2d = (Graphics2D) g;
         drawBackgorund();
         drawTitle();
@@ -359,22 +362,27 @@ public class XCardSwitchButton extends XButton {
 	}
 
 	public void adjustTabs(int tabLength, Map<Integer, Integer> width, Map<Integer, Integer> height) {
+		if (width == null) {
+			return;
+		}
 		int tempX = 0;
 		for (int i = 0; i < tabLength; i++) {
 			Rectangle rectangle = this.tagLayout.getComponent(i).getBounds();
 			Integer cardWidth = width.get(i) + SIDE_OFFSET;
-			Integer cardHeight = height.get(i) + HEIGHT_OFFSET;
+			//先用这边的固定高度
+			Integer cardHeight = DEFAULT_BUTTON_HEIGHT;
 			rectangle.setSize(cardWidth, cardHeight);
 			rectangle.setBounds(tempX, 0, cardWidth, cardHeight);
 			tempX += cardWidth;
 			this.tagLayout.getComponent(i).setBounds(rectangle);
 			Dimension dimension = new Dimension();
 			dimension.setSize(cardWidth, cardHeight);
-			this.getContentLabel().setSize(dimension);
-			this.setSize(dimension);
 			XCardSwitchButton temp = (XCardSwitchButton) this.tagLayout.getComponent(i);
-			CardSwitchButton tempCard = (CardSwitchButton) temp.toData();
+			UILabel label = temp.getContentLabel();
-			//tempCard.setDefaultWidth(cardWidth);
+			label.setSize(dimension);
+			temp.setContentLabel(label);
+			temp.setSize(dimension);
+			temp.setPreferredSize(new Dimension(cardWidth, cardHeight));
 		}
 	}
 

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

@@ -198,8 +198,7 @@ public class XWCardLayout extends XLayoutContainer {
 		firstBtn.setText(Inter.getLocText("FR-Designer_Title") + 0);
 		firstBtn.setInitialBackground(ColorBackground.getInstance(Color.WHITE));
 		xTag.setCurrentCard(firstBtn);
-		XCardSwitchButton xFirstBtn = new XCardSwitchButton(firstBtn, new Dimension(CardSwitchButton.DEF_WIDTH, -1),this,xTag);
+		XCardSwitchButton xFirstBtn = new XCardSwitchButton(firstBtn, new Dimension(CardSwitchButton.DEF_WIDTH, -1), this, xTag);
-		firstBtn.setCustomStyle(true);
 		xFirstBtn.setBackupParent(xTag);
 		
 		return xFirstBtn;

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

@@ -163,18 +163,6 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
 	 * void
 	 */
 	public void adjustComponentWidth(){
-		int btnNum = this.getComponentCount();
-		int tagLayoutWidth = this.getWidth();
-		int allBtnWidth = btnNum * CardSwitchButton.DEF_WIDTH + btnNum;
-		int size = CardSwitchButton.DEF_WIDTH;
-		if(tagLayoutWidth - allBtnWidth < CardSwitchButton.DEF_WIDTH){
-			size = (tagLayoutWidth - CardSwitchButton.DEF_WIDTH - btnNum)/btnNum;
-		}
-		WCardTagLayout layout = (WCardTagLayout)this.toData();
-		for(int i=0;i<btnNum;i++){
-			CardSwitchButton button = layout.getSwitchButton(i);
-			layout.setWidthAtWidget(button, size);
-		}
 	}
 	
 	

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

@@ -27,6 +27,7 @@ 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.general.Background;
+import com.fr.general.FRFont;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
@@ -41,12 +42,12 @@ public class XWTabFitLayout extends XWFitLayout {
 	private static final int MIN_SIZE = 1;
 	// tab布局在拖拽导致的缩放里（含间隔时），如果拖拽宽高大于组件宽高，会导致调整的时候找不到原来的组件
 	// 这里先将拖拽之前的宽高先做备份
-	public static final Color NORMAL_GRAL = new Color(236,236,236);
+	private static final Color NORMAL_GRAL = new Color(236,236,236);
-	public static final Color CHOOSED_GRAL = new Color(222,222,222);
 	private Dimension referDim;
 	private Background initialBackground;
 	private Background overBackground;
 	private Background clickBackground;
+	private FRFont font;
 	private XCardSwitchButton xCardSwitchButton;
 
 	public Dimension getReferDim() {
@@ -81,6 +82,15 @@ public class XWTabFitLayout extends XWFitLayout {
 		this.clickBackground = clickBackground;
 	}
 
+	@Override
+	public FRFont getFont() {
+		return font;
+	}
+
+	public void setFont(FRFont font) {
+		this.font = font;
+	}
+
 	public XCardSwitchButton getxCardSwitchButton() {
 		return xCardSwitchButton;
 	}
@@ -105,7 +115,7 @@ public class XWTabFitLayout extends XWFitLayout {
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
 		checkButonType();
 		CRPropertyDescriptor[] crp = ((WTabFitLayout) data).isCustomStyle() ? getisCustomStyle() : getisnotCustomStyle();
-		return ArrayUtils.addAll(super.supportedDescriptor(), crp);
+		return ArrayUtils.addAll(defaultDescriptor(), crp);
 	}
 
 	protected CRPropertyDescriptor[] getisCustomStyle() throws IntrospectionException {
@@ -195,6 +205,14 @@ public class XWTabFitLayout extends XWFitLayout {
 		return crPropertyDescriptors[i];
 	}
 
+	protected CRPropertyDescriptor[] defaultDescriptor() throws IntrospectionException {
+		CRPropertyDescriptor[] crPropertyDescriptors = {
+				super.createWidgetNameDescriptor(),
+				super.createMarginDescriptor()
+		};
+		return crPropertyDescriptors;
+	}
+
 	private void checkButonType() {
 		if (this.xCardSwitchButton == null) {
 			return;