Browse Source

Pull request #15149: REPORT-135996 fix:属性面板视觉验收问题

Merge in DESIGN/design from ~ZONGYU.WANG/design:fbp/master to fbp/master

* commit '59145032022da02e057b8c5519d8eafb74661489':
  REPORT-135996 fix:属性面板视觉验收问题
fbp/master
Zongyu.Wang-王宗雨 2 months ago
parent
commit
5c1e8be413
  1. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java
  2. 4
      designer-realize/src/main/java/com/fr/design/sort/common/SortColumnRowPane.java
  3. 1
      designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java

@ -457,9 +457,9 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
private class ChartChangeButton extends UIToggleButton {
private final double DEL_WIDTH = scale(10);
private final double DEL_WIDTH = scale(13);
private final double DOWN_HEIGHT = scale(1);
private final Icon closeIcon = new LazyIcon("closeTag", 8);
private final Icon closeIcon = new LazyIcon("closeTag", 12);
private boolean isMoveOn = false;
private String buttonName = "";

4
designer-realize/src/main/java/com/fr/design/sort/common/SortColumnRowPane.java

@ -82,9 +82,9 @@ public class SortColumnRowPane extends JPanel implements UIObserver {
void initTextField() {
colJTextField = new JTextField();
colJTextField.setEditable(false);
colJTextField.setEnabled(false);
rowJTextField = new JTextField();
rowJTextField.setEditable(false);
rowJTextField.setEnabled(false);
}
void initSelectButton() {

1
designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java

@ -94,6 +94,7 @@ public class HeaderSortRulePane extends JPanel {
private ColorControlWindow colorSelector;
IconButton(SortRule sortRule) {
this.setLayout(new BorderLayout());
this.sortRule = sortRule;
initComponents();
}

Loading…
Cancel
Save