Browse Source

Pull request #9215: REPORT-73488 使用取色器配置颜色后,最近使用的颜色列表不会被更新

Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0

* commit '8a20aff9ced4340288780785650ff76d377c6ea0':
  REPORT-73488 使用取色器配置颜色后,最近使用的颜色列表不会被更新
newui
kerry 2 years ago
parent
commit
a273f0c448
  1. 2
      designer-base/src/main/java/com/fr/design/style/color/ColorPicker.java

2
designer-base/src/main/java/com/fr/design/style/color/ColorPicker.java

@ -4,6 +4,7 @@ package com.fr.design.style.color;
* Created by plough on 2016/12/22. * Created by plough on 2016/12/22.
*/ */
import com.fr.design.DesignerEnvManager;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.IOUtils; import com.fr.general.IOUtils;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
@ -137,6 +138,7 @@ public class ColorPicker extends JDialog implements ActionListener {
timer.stop(); timer.stop();
if (setColor) { if (setColor) {
colorSelectable.setColor(colorToSet); colorSelectable.setColor(colorToSet);
DesignerEnvManager.getEnvManager().getColorConfigManager().addToColorQueue(new Color(colorToSet.getRGB()));
} }
this.dispose(); this.dispose();
} }

Loading…
Cancel
Save