Browse Source

Pull request #14834: REPORT-134696 & REPORT-134691 & REPORT-134306 & REPORT-133443 fix: NewUI适配问题修复

Merge in DESIGN/design from ~LEVY.XIE/design:fbp/release to fbp/release

* commit '505e683231759277a029c28a7577a2ec4f94a7ef':
  REPORT-134696 & REPORT-134691 & REPORT-134306 & REPORT-133443 fix: NewUI适配问题修复
fbp/release
Levy.Xie-解安森 2 months ago
parent
commit
899c01452a
  1. 2
      designer-base/src/main/java/com/fr/design/gui/itextfield/UITextField.java
  2. 1
      designer-chart/src/main/java/com/fr/design/chartx/component/correlation/AbstractCorrelationPane.java
  3. 5
      designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeBeautyPane.java
  4. 11
      designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java

2
designer-base/src/main/java/com/fr/design/gui/itextfield/UITextField.java

@ -154,7 +154,7 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs
* 设置变化的背景颜色
*/
public void setBackgroundUIColor(Color color) {
// ((UITextFieldUI) this.ui).setBackgroundColor4NoGiveNumber(color);
setBackground(color);
}
/**

1
designer-chart/src/main/java/com/fr/design/chartx/component/correlation/AbstractCorrelationPane.java

@ -81,6 +81,7 @@ public abstract class AbstractCorrelationPane<T> extends BasicBeanPane<T> {
@Override
public void actionPerformed(ActionEvent e) {
tablePane.addLine(createLine());
tablePane.doParentRepaintEvent();
fireTargetChanged();
}
};

5
designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeBeautyPane.java

@ -10,6 +10,7 @@ import com.fr.plugin.chart.type.GradientType;
import com.fr.van.chart.designer.component.VanChartBeautyPane;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.event.ActionEvent;
@ -57,7 +58,9 @@ public class VanChartGaugeBeautyPane extends VanChartBeautyPane {
}
private void checkGradientBarVisible() {
gradientBarPane.setVisible(getGradientTypeBox().getSelectedIndex() == 1);
SwingUtilities.invokeLater(() -> {
gradientBarPane.setVisible(getGradientTypeBox().getSelectedIndex() == 1);
});
}
protected String[] getNameArray() {

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

@ -119,17 +119,6 @@ public class VanChartGaugeSeriesPane extends VanChartMultiColorSeriesPane {
JPanel stylePane = valueFillStylePane == null ? new JPanel() : valueFillStylePane;
colorPickerPane = new ColorPickerPaneWithMaxMin(parentPane, "meterString", valueFillStylePane) {
protected int getBoundX() {
return 0;
}
protected int getBoundY() {
return 10;
}
protected int getPreferredMarginY() {
return 10;
}
protected double getDescriptionWidth() {
double descriptionWidth = super.getDescriptionWidth();

Loading…
Cancel
Save