Browse Source

Merge pull request #11983 in DESIGN/design from release/11.0 to bugfix/11.0

* commit '844e6d809bb5650642a786aa743d72f76eaa5c2c':
  REPORT-92161 反色问题,把选中变色的逻辑提出,和setIcon分开
  REPORT-92161 反色问题,把选中变色的逻辑提出,和setIcon分开
bugfix/11.0
superman 2 years ago
parent
commit
185740513f
  1. 14
      designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java

14
designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java

@ -376,16 +376,16 @@ public abstract class JListControlPane extends JControlPane implements ListContr
Nameable nameable = element.wrapper;
this.textLabel.setText(nameable.getName());
boolean iconSet = false;
if(isSelected) {
this.textLabel.setBackground(selectedBgColor);
this.textLabel.setForeground(Color.WHITE);
} else {
this.textLabel.setBackground(Color.WHITE);
this.textLabel.setForeground(Color.BLACK);
}
for (NameableCreator creator : JListControlPane.this.creators()) {
if (creator.menuIcon() != null && creator.acceptObject2Populate(nameable) != null) {
this.iconLabel.setIcon(creator.menuIcon());
if(isSelected) {
this.textLabel.setBackground(selectedBgColor);
this.textLabel.setForeground(Color.WHITE);
} else {
this.textLabel.setBackground(Color.WHITE);
this.textLabel.setForeground(Color.BLACK);
}
this.setToolTipText(creator.createTooltip());
iconSet = true;
break;

Loading…
Cancel
Save