From 7fa55dda36df7ec2845d568d8b476495fdf2f175 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 14 Nov 2017 11:48:22 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-5489=20@Plough=EF=BC=9A9.0=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E4=BA=A4=E4=BA=92=E9=AA=8C=E6=94=B6=3D>?= =?UTF-8?q?=E2=80=9C=E6=B7=BB=E5=8A=A0...=E2=80=9D=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/controlpane/UIControlPane.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java index 66ce1865c..bc37a2549 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java @@ -40,6 +40,7 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH protected BasePlot plot; private static final int TOP_TOOLBAR_HEIGHT = 20; private static final int TOP_TOOLBAR_WIDTH = 156; // 可能因为用了tablelayout，要比其他地方多一个像素，看起来才正常 + private static final int TOP_TOOLBAR_WIDTH_SHORT = 76; public UIControlPane() { this.initComponentPane(); @@ -209,7 +210,7 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH protected JPanel getLeftTopPane (UIToolbar topToolBar) { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] columnSize = { p, f, TOP_TOOLBAR_WIDTH}; + double[] columnSize = { p, f, isNewStyle() ? TOP_TOOLBAR_WIDTH : TOP_TOOLBAR_WIDTH_SHORT}; double[] rowSize = {TOP_TOOLBAR_HEIGHT}; Component[][] components = new Component[][]{ new Component[]{new UILabel(getAddItemText()), new JPanel(), topToolBar},