Browse Source

Merge pull request #8253 in DESIGN/design from release/11.0 to feature/x

* commit 'e1168fd8c5b42cd2d8a4ec4ff1e9ce844d66207f':
  REPORT-67833 富文本-颜色设置:选择主题色后最近使用的颜色处不会更新,需要多次点击
feature/x
superman 3 years ago
parent
commit
70370bac0a
  1. 4
      designer-base/src/main/java/com/fr/design/style/color/ColorCell.java

4
designer-base/src/main/java/com/fr/design/style/color/ColorCell.java

@ -100,11 +100,13 @@ public class ColorCell extends JComponent implements ColorSelectable {
if (e == null || e.getID() == MouseEvent.MOUSE_RELEASED) {
colorSelectable.setColor(this.getColor());
colorSelectable.colorSetted(this);
// 先添加最近使用
if (this.getColor() != null) {
int rgb = this.getColor().getRGB();
DesignerEnvManager.getEnvManager().getColorConfigManager().addToColorQueue(new Color(rgb));
}
// 这边会获取到最近使用颜色并更新 添加逻辑需要放到前面 否则不会及时更新
colorSelectable.colorSetted(this);
}
if (e != null) {

Loading…
Cancel
Save