Browse Source

Pull request #5320: CHART-20211 面板间距调整

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

* commit 'e40b2d1c1fa5a9aefdeb301e8fcc0d546127451e':
  CHART-20211 面板间距调整
feature/10.0
Bjorn 3 years ago
parent
commit
db3e798959
  1. 10
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java
  2. 4
      designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java

10
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java

@ -277,11 +277,11 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
*/ */
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
if (designTypeButtonGroup.getSelectedIndex() == 0) { if (designTypeButtonGroup.getSelectedIndex() == 0) {
return new Dimension(colorGroup.getPreferredSize().width + textGroup.getPreferredSize().width, upControlPane.getPreferredSize().height + getBoundY()); return new Dimension(colorGroup.getPreferredSize().width + textGroup.getPreferredSize().width, upControlPane.getPreferredSize().height + getPreferredMarginY());
} else { } else {
int extra = stagePanel == null ? 0 : stagePanel.getPreferredSize().height + getBoundY(); int extra = stagePanel == null ? 0 : stagePanel.getPreferredSize().height + getPreferredMarginY();
return new Dimension(colorGroup.getPreferredSize().width + textGroup.getPreferredSize().width, return new Dimension(colorGroup.getPreferredSize().width + textGroup.getPreferredSize().width,
extra + textGroup.getPreferredSize().height + upControlPane.getPreferredSize().height + OFF_HEIGHT + getBoundY()); extra + textGroup.getPreferredSize().height + upControlPane.getPreferredSize().height + OFF_HEIGHT + getPreferredMarginY());
} }
} }
@ -662,6 +662,10 @@ public class UIColorPickerPane extends BasicPane implements UIObserver {
return UPCONTROLPANE_WIDTH; return UPCONTROLPANE_WIDTH;
} }
protected int getPreferredMarginY() {
return MARGIN_TOP;
}
/** /**
*刷新颜色选取器 *刷新颜色选取器
* @param colorArray 颜色值 * @param colorArray 颜色值

4
designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java

@ -132,6 +132,10 @@ public class VanChartGaugeSeriesPane extends VanChartMultiColorSeriesPane {
return 10; return 10;
} }
protected int getPreferredMarginY() {
return 10;
}
protected double getDescriptionWidth() { protected double getDescriptionWidth() {
double descriptionWidth = super.getDescriptionWidth(); double descriptionWidth = super.getDescriptionWidth();
if (valueFillStylePane == null) { if (valueFillStylePane == null) {

Loading…
Cancel
Save