Merge pull request #11984 in DESIGN/design from bugfix/11.0 to feature/x

* commit '185740513f2f049f1d447f4172b5050fb530ba6f':
  REPORT-92161 反色问题,把选中变色的逻辑提出,和setIcon分开
  REPORT-92161 反色问题,把选中变色的逻辑提出,和setIcon分开

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

@@ -376,9 +376,6 @@ public abstract class JListControlPane extends JControlPane implements ListContr
                 Nameable nameable = element.wrapper;
                 this.textLabel.setText(nameable.getName());
                 boolean iconSet = false;
-                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);
@@ -386,6 +383,9 @@ public abstract class JListControlPane extends JControlPane implements ListContr
                     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());
                         this.setToolTipText(creator.createTooltip());
                         iconSet = true;
                         break;