From 61b5557eff18b5ad074c8c5ab26e6040c4c162e9 Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 28 Dec 2017 10:40:45 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-6251=20=E6=96=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9Atabpane=E6=98=BE=E7=A4=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/designer/creator/cardlayout/XWCardTagLayout.java | 6 ------ 1 file changed, 6 deletions(-) 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 6f6c82e8a0..e02b9e2b94 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 @@ -166,7 +166,6 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout { comp.setBackupParent(this); } } -// setTabsAndAdjust(); isRefreshing = false; } @@ -359,16 +358,13 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout { int tabPaneSize = parent.getHeight(); //调整XWCardTagLayout的高度 int tempX = 0; -// int maxHeight = DEFAULT_BUTTON_HEIGHT; for (int i = 0; i < tabLength; i++) { - Rectangle rectangle = this.getComponent(i).getBounds(); Integer cardWidth = width.get(i) + WIDTH_SIDE_OFFSET; Integer cardHeight = tabPaneSize; if(cardHeight < DEFAULT_BUTTON_HEIGHT){ cardHeight = DEFAULT_BUTTON_HEIGHT; } -// maxHeight = maxHeight > cardHeight ? maxHeight : cardHeight ; rectangle.setBounds(tempX, 0, cardWidth, cardHeight); tempX += cardWidth; XCardSwitchButton temp = (XCardSwitchButton) this.getComponent(i); @@ -405,11 +401,9 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout { XLayoutContainer parent = this.getBackupParent(); int tabPaneSize = parent.getWidth(); int tempY = 0; -// int maxWidth = DEFAULT_BUTTON_HEIGHT; for (int i = 0; i < tabLength; i++) { Rectangle rectangle = this.getComponent(i).getBounds(); Integer cardWidth = tabPaneSize; -// maxWidth = maxWidth > cardWidth ? maxWidth : cardWidth; //先用这边的固定高度 Integer cardHeight = height.get(i) + HEIGHT_SIDE_OFFSET;