Browse Source

Pull request #4857: CHART-19720 控件顺序反了

Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0

* commit '1b0b51e746ea7c36bbbc293102a0ebf5c1d4837f':
  CHART-19720  控件顺序反了
feature/10.0
Bjorn 3 years ago
parent
commit
4799c9a1ef
  1. 12
      designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java

12
designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java

@ -209,9 +209,9 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
} }
private void createChangeEnablePane(VanChartRectanglePlot plot) { private void createChangeEnablePane(VanChartRectanglePlot plot) {
String scroll = Toolkit.i18nText("Fine-Design_Chart_Scroll");
String scaleAxis = Toolkit.i18nText("Fine-Design_Chart_Scale_Axis"); String scaleAxis = Toolkit.i18nText("Fine-Design_Chart_Scale_Axis");
controlType = new UIButtonGroup<>(new String[]{scroll, scaleAxis}, ControlType.values()); String scroll = Toolkit.i18nText("Fine-Design_Chart_Scroll");
controlType = new UIButtonGroup<>(new String[]{scaleAxis, scroll}, ControlType.values());
JPanel scaleAxisPane = createScaleAxisPane(); JPanel scaleAxisPane = createScaleAxisPane();
JPanel scrollPane = createScrollPane(plot); JPanel scrollPane = createScrollPane(plot);
@ -225,8 +225,8 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
} }
} }
}; };
centerPane.add(scaleAxisPane, scroll); centerPane.add(scaleAxisPane, scaleAxis);
centerPane.add(scrollPane, scaleAxis); centerPane.add(scrollPane, scroll);
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;
@ -291,9 +291,9 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
if (centerPane != null && controlType != null) { if (centerPane != null && controlType != null) {
CardLayout cardLayout = (CardLayout) centerPane.getLayout(); CardLayout cardLayout = (CardLayout) centerPane.getLayout();
if (controlType.getSelectedItem() == ControlType.ZOOM) { if (controlType.getSelectedItem() == ControlType.ZOOM) {
cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Scroll"));
} else {
cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Scale_Axis")); cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Scale_Axis"));
} else {
cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Scroll"));
} }
} }
} }

Loading…
Cancel
Save