Browse Source

Merge pull request #598 in BA/design from ~VITO/design:master to master

* commit '96f01dc0b733ad07d973d921d26824730bffc573':
  REPORT-1222 - 表单界面图表浮动面板不随主窗口变化位置
master
superman 8 years ago
parent
commit
e225c155d0
  1. 22
      designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java

22
designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java

@ -200,19 +200,17 @@ public class FormParaWidgetPane extends JPanel {
chartPopUpButton.addMouseListener(new MouseAdapter() { chartPopUpButton.addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
if (chartTypeWindow == null) { 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));
componentsPara.add(new ToolBarButton(chartOption));
}
int x = COMMON_CHAR_NUM * (widgetButtonWidth + smallGAP);
int y = (int) Math.ceil(chartOptions.length / ((double) COMMON_CHAR_NUM)) * (widgetButtonHeight + smallGAP);
componentsPara.setPreferredSize(new Dimension(x, y));
chartTypeWindow = new PopUpWindow(componentsPara, Inter.getLocText("FR-Designer-Form-ToolBar_Chart"));
chartTypeWindow.setLocation((int) jSeparatorLayout.getLocationOnScreen().getX() + 1, (int) jSeparatorLayout.getLocationOnScreen().getY());
chartTypeWindow.setSize(chartTypeWindow.getPreferredSize());
} }
int x = COMMON_CHAR_NUM * (widgetButtonWidth + smallGAP);
int y = (int) Math.ceil(chartOptions.length / ((double) COMMON_CHAR_NUM)) * (widgetButtonHeight + smallGAP);
componentsPara.setPreferredSize(new Dimension(x, y));
chartTypeWindow = new PopUpWindow(componentsPara, Inter.getLocText("FR-Designer-Form-ToolBar_Chart"));
chartTypeWindow.setLocation((int) jSeparatorLayout.getLocationOnScreen().getX() + 1, (int) jSeparatorLayout.getLocationOnScreen().getY());
chartTypeWindow.setSize(chartTypeWindow.getPreferredSize());
chartTypeWindow.setVisible(true); chartTypeWindow.setVisible(true);
} }
}); });

Loading…
Cancel
Save