Browse Source

Pull request #1873: CHART-14689 切换按钮换行不限制高度

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

* commit '03a36cd7f36d83a62f81867d7c4736a61c5c0294':
  CHART-14689 切换按钮换行不限制高度
feature/big-screen
Bjorn 4 years ago
parent
commit
224efd7b4d
  1. 5
      designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java

5
designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java

@ -53,7 +53,6 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
JPanel customPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
groupButton = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Custom_Color"), Toolkit.i18nText("Fine-Design_Chart_Gradient_Color")});
groupButton.setPreferredSize(new Dimension(155, 20));
groupButton.setSelectedIndex(0);
customPane.add(groupButton, BorderLayout.NORTH);
@ -64,11 +63,11 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
cardLayout.show(changeColorSetPane, "acc");
customPane.add(changeColorSetPane, BorderLayout.CENTER);
customPane.setPreferredSize(new Dimension(155, 200));
customPane.setPreferredSize(new Dimension(155, 300));
colorGradient.setPreferredSize(new Dimension(155, 30));
colorGradient.getSelectColorPointBtnP1().setColorInner(Color.WHITE);
colorGradient.getSelectColorPointBtnP2().setColorInner(FixedGradientBar.NEW_CHARACTER);
double p = TableLayout.PREFERRED;
double[] columnSize = {p, p};
double[] rowSize = {p, p, p};

Loading…
Cancel
Save