fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Pull request #11191: REPORT-87576 取色板使用后会让fr卡住。可稳定复现 

Merge in DESIGN/design from ~YANN/design:final/11.0 to final/11.0

* commit '0a11d39fb414aa7ef3cb49bd0a892adc83bedd36':
  REPORT-87576 取色板使用后会让fr卡住。可稳定复现
new-design
Yann-刘之言 2 years ago
parent
75d3792225 0a11d39fb4
commit
0cfef2355c
1 changed files with 19 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java

17
designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java
Unescape View File

@ -265,34 +265,31 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
int lineStyle = currentLineCombo.getSelectedLineStyle(); int lineStyle = currentLineCombo.getSelectedLineStyle();
Color lineColor = currentLineColorPane.getSelectObject(); Color lineColor = currentLineColorPane.getSelectObject();
CellBorderStyle cellBorderStyle = new CellBorderStyle(); CellBorderStyle cellBorderStyle = new CellBorderStyle();
if (lineColor != null) {
if (topToggleButton.isSelected()) { if (topToggleButton.isSelected()) {
cellBorderStyle.setTopColor(lineColor); cellBorderStyle.setTopColor(lineColor);
} }
cellBorderStyle.setTopStyle(topToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
if (bottomToggleButton.isSelected()) { if (bottomToggleButton.isSelected()) {
cellBorderStyle.setBottomColor(lineColor); cellBorderStyle.setBottomColor(lineColor);
} }
cellBorderStyle.setBottomStyle(bottomToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
if (leftToggleButton.isSelected()) { if (leftToggleButton.isSelected()) {
cellBorderStyle.setLeftColor(lineColor); cellBorderStyle.setLeftColor(lineColor);
} }
cellBorderStyle.setLeftStyle(leftToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
if (rightToggleButton.isSelected()) { if (rightToggleButton.isSelected()) {
cellBorderStyle.setRightColor(lineColor); cellBorderStyle.setRightColor(lineColor);
} }
cellBorderStyle.setRightStyle(rightToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
if (verticalToggleButton.isSelected()) { if (verticalToggleButton.isSelected()) {
cellBorderStyle.setVerticalColor(lineColor); cellBorderStyle.setVerticalColor(lineColor);
} }
cellBorderStyle.setVerticalStyle(verticalToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
if (horizontalToggleButton.isSelected()) { if (horizontalToggleButton.isSelected()) {
cellBorderStyle.setHorizontalColor(lineColor); cellBorderStyle.setHorizontalColor(lineColor);
} }
}
cellBorderStyle.setTopStyle(topToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
cellBorderStyle.setBottomStyle(bottomToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
cellBorderStyle.setLeftStyle(leftToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
cellBorderStyle.setRightStyle(rightToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
cellBorderStyle.setVerticalStyle(verticalToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
cellBorderStyle.setHorizontalStyle(horizontalToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE); cellBorderStyle.setHorizontalStyle(horizontalToggleButton.isSelected() ? lineStyle : Constants.LINE_NONE);
outerToggleButton.setSelected(leftToggleButton.isSelected() && bottomToggleButton.isSelected() && rightToggleButton.isSelected() && topToggleButton.isSelected()); outerToggleButton.setSelected(leftToggleButton.isSelected() && bottomToggleButton.isSelected() && rightToggleButton.isSelected() && topToggleButton.isSelected());

Write Preview
Loading…
Cancel
Save