From 244201f4a83df1936015d289156421ec6c698e32 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 15 Jan 2019 17:14:19 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-14057=2010.0=E6=97=A5=E6=96=87=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=3D>56=20?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=3D>=E6=A0=B7=E5=BC=8F=3D>=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/gui/style/ThirdTabPane.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ThirdTabPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ThirdTabPane.java index 8f450d259..a0580ba46 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ThirdTabPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ThirdTabPane.java @@ -8,9 +8,16 @@ import com.fr.design.dialog.BasicScrollPane; import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; import com.fr.design.gui.ibutton.UIButtonGroup; -import javax.swing.*; +import javax.swing.JPanel; import javax.swing.border.Border; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.CardLayout; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.List; @@ -18,6 +25,7 @@ import java.util.List; public abstract class ThirdTabPane extends BasicBeanPane{ private static final long serialVersionUID = 2298609199400393886L; + private static final int MIN_TAB_HEIGHT = 25; protected UIButtonGroup tabPane; protected String[] nameArray; public JPanel centerPane; @@ -49,7 +57,12 @@ public abstract class ThirdTabPane extends BasicBeanPane{ if (!paneList.isEmpty()) { tabPane = new UIButtonGroup(nameArray); tabPane.setSelectedIndex(0); - tabPane.setPreferredSize(new Dimension(60 * nameArray.length, 25)); + int prefHeight = tabPane.getPreferredSize().height; + int prefWidth = tabPane.getPreferredSize().width + 20; // 暂且加一个偏移量 + int minWidth = 60 * nameArray.length; + tabPane.setPreferredSize( + new Dimension(prefWidth > minWidth ? prefWidth : minWidth, + prefHeight > MIN_TAB_HEIGHT ? prefHeight : MIN_TAB_HEIGHT)); tabPane.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) {