Browse Source

Merge pull request #1221 in BA/design from ~HZZZ/design:REPORT-4305 to release/9.0

* commit '4e2c17280cd6c989f174ee55bce8b0be2034b444':
  边框,缩进
master
superman 7 years ago
parent
commit
d86d710d05
  1. 2
      designer_base/src/com/fr/design/gui/icombobox/FunctionComboBox.java
  2. 4
      designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java

2
designer_base/src/com/fr/design/gui/icombobox/FunctionComboBox.java

@ -60,7 +60,7 @@ public class FunctionComboBox extends UIComboBox {
if (value instanceof DataFunction) { if (value instanceof DataFunction) {
DataFunction function = (DataFunction) value; DataFunction function = (DataFunction) value;
this.setText(DataCoreUtils.getFunctionDisplayName(function)); this.setText(" " + DataCoreUtils.getFunctionDisplayName(function));
} }
return this; return this;

4
designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java

@ -67,9 +67,9 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
} }
g2d.setColor(linecolor); g2d.setColor(linecolor);
if (!comboBox.isPopupVisible()) { if (!comboBox.isPopupVisible()) {
g2d.drawRoundRect(0, 0, c.getWidth() - arrowButton.getWidth() + 3, c.getHeight() - 1, UIConstants.LARGEARC, UIConstants.LARGEARC); g2d.drawRoundRect(0, 0, c.getWidth() - arrowButton.getWidth() + 3, c.getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
} else { } else {
g2d.drawRoundRect(0, 0, c.getWidth(), c.getHeight() + 3, UIConstants.LARGEARC, UIConstants.LARGEARC); g2d.drawRoundRect(0, 0, c.getWidth(), c.getHeight() + 3, UIConstants.ARC, UIConstants.ARC);
g2d.drawLine(0, c.getHeight() - 1, c.getWidth(), c.getHeight() - 1); g2d.drawLine(0, c.getHeight() - 1, c.getWidth(), c.getHeight() - 1);
} }
} }

Loading…
Cancel
Save