diff --git a/designer_base/src/com/fr/design/style/FRFontPane.java b/designer_base/src/com/fr/design/style/FRFontPane.java index 42da861083..0ad4702f09 100644 --- a/designer_base/src/com/fr/design/style/FRFontPane.java +++ b/designer_base/src/com/fr/design/style/FRFontPane.java @@ -67,6 +67,9 @@ public class FRFontPane extends BasicPane { private static final int MAX_FONT_SIZE = 100; + // 兼容调用老接口(FRFontPane.FONT_SIZES)的代码(例如图表插件) + public static final Vector FONT_SIZES = getFontSizes(); + public FRFontPane() { this.initComponents(); } diff --git a/designer_form/src/com/fr/design/designer/properties/WidgetPropertyTable.java b/designer_form/src/com/fr/design/designer/properties/WidgetPropertyTable.java index 07621fc260..148ca548a7 100644 --- a/designer_form/src/com/fr/design/designer/properties/WidgetPropertyTable.java +++ b/designer_form/src/com/fr/design/designer/properties/WidgetPropertyTable.java @@ -93,13 +93,6 @@ public class WidgetPropertyTable extends AbstractPropertyTable { this.repaint(); } - private void setRightColumnWidth(boolean automode) { - int rightColumnWidth = this.getWidth() - LEFT_COLUMN_WIDTH; - TableColumn tcRight = this.getColumn(this.getColumnName(1)); - tcRight.setMinWidth(automode ? 0 : rightColumnWidth); - tcRight.setMaxWidth(automode ? this.getWidth() : rightColumnWidth); - } - private void setDesigner(FormDesigner designer) { this.designer = designer; } @@ -121,13 +114,6 @@ public class WidgetPropertyTable extends AbstractPropertyTable { return null; } - @Override - public void columnMarginChanged(javax.swing.event.ChangeEvent e) { - setRightColumnWidth(false); - super.columnMarginChanged(e); - setRightColumnWidth(true); - } - /** * 待说明 */