Browse Source

Merge pull request #1359 in BA/design from ~PLOUGH/design:release/8.0 to release/8.0

* commit 'd95c8a7bd02f9944243355e0bc1fe8ca650e9ea6':
  无JIRA任务,兼容调用老接口(FRFontPane.FONT_SIZES)的代码
  REPORT-4467 控件属性界面收起再展开后,显示有问题
superman 8 years ago
parent
commit
d439d225ad
  1. 3
      designer_base/src/com/fr/design/style/FRFontPane.java
  2. 14
      designer_form/src/com/fr/design/designer/properties/WidgetPropertyTable.java

3
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<Integer> FONT_SIZES = getFontSizes();
public FRFontPane() {
this.initComponents();
}

14
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);
}
/**
* 待说明
*/

Loading…
Cancel
Save