Browse Source

Pull request #9172: REPORT-71901 安装/禁用图表插件,图表工具栏更新异常

Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0

* commit 'b3c10172950ff423ac5aa90820d509a41db9b853':
  REPORT-71901 安装/禁用图表插件,图表工具栏更新异常
newui
fanglei 2 years ago
parent
commit
65d07774c7
  1. 4
      designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java

4
designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java

@ -199,7 +199,9 @@ public class FormParaWidgetPane extends JPanel {
JPanel componentsPara = new JPanel(new FlowLayout(FlowLayout.LEFT)); JPanel componentsPara = new JPanel(new FlowLayout(FlowLayout.LEFT));
WidgetOption[] chartOptions = loadChartOptions(); WidgetOption[] chartOptions = loadChartOptions();
for (WidgetOption chartOption : chartOptions) { for (WidgetOption chartOption : chartOptions) {
componentsPara.add(new ToolBarButton(chartOption)); ToolBarButton button = new ToolBarButton(chartOption);
button.setPreferredSize(new Dimension(widgetButtonWidth, widgetButtonHeight));
componentsPara.add(button);
} }
int x = COMMON_CHAR_NUM * (widgetButtonWidth + smallGAP); int x = COMMON_CHAR_NUM * (widgetButtonWidth + smallGAP);
int y = (int) Math.ceil(chartOptions.length / ((double) COMMON_CHAR_NUM)) * (widgetButtonHeight + smallGAP); int y = (int) Math.ceil(chartOptions.length / ((double) COMMON_CHAR_NUM)) * (widgetButtonHeight + smallGAP);

Loading…
Cancel
Save