|
|
@ -1,5 +1,6 @@ |
|
|
|
package com.fr.design.mainframe.theme.edit.ui; |
|
|
|
package com.fr.design.mainframe.theme.edit.ui; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import com.fr.base.FineColor; |
|
|
|
import com.fr.base.background.ColorBackground; |
|
|
|
import com.fr.base.background.ColorBackground; |
|
|
|
import com.fr.design.event.UIObserver; |
|
|
|
import com.fr.design.event.UIObserver; |
|
|
|
import com.fr.design.event.UIObserverListener; |
|
|
|
import com.fr.design.event.UIObserverListener; |
|
|
@ -160,7 +161,9 @@ public class ColorListPane extends JPanel implements UIObserver { |
|
|
|
colorPane.addChangeListener(new ChangeListener() { |
|
|
|
colorPane.addChangeListener(new ChangeListener() { |
|
|
|
public void stateChanged(ChangeEvent e) { |
|
|
|
public void stateChanged(ChangeEvent e) { |
|
|
|
hidePopupMenu(); |
|
|
|
hidePopupMenu(); |
|
|
|
color = ((NewColorSelectPane) e.getSource()).getColor(); |
|
|
|
FineColor fineColor = ((NewColorSelectPane) e.getSource()).getColor(); |
|
|
|
|
|
|
|
// 不要直接使用原始的FineColor对象,它的值会变化,这里实际需要的内部的真实颜色
|
|
|
|
|
|
|
|
color = fineColor.getColor(); |
|
|
|
fireDisplayComponent(ColorBackground.getInstance(color)); |
|
|
|
fireDisplayComponent(ColorBackground.getInstance(color)); |
|
|
|
ColorListPane.ColorButton.this.fireStateChanged(); |
|
|
|
ColorListPane.ColorButton.this.fireStateChanged(); |
|
|
|
} |
|
|
|
} |
|
|
|