diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/OrderEntryAppearanceServiceImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/OrderEntryAppearanceServiceImpl.java index 7ce323537d05..fe8ce129033e 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/OrderEntryAppearanceServiceImpl.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/OrderEntryAppearanceServiceImpl.java @@ -131,7 +131,7 @@ public class OrderEntryAppearanceServiceImpl extends OrderEntryAppearanceService if (showVersion) { String versionString = jdk.getVersionString(); if (versionString != null && !versionString.equals(name)) { - SimpleTextAttributes textAttributes = isInComboBox ? SimpleTextAttributes.SYNTHETIC_ATTRIBUTES : + SimpleTextAttributes textAttributes = isInComboBox && !selected ? SimpleTextAttributes.SYNTHETIC_ATTRIBUTES : SystemInfo.isMac && selected ? new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, Color.WHITE): SimpleTextAttributes.GRAY_ATTRIBUTES; ending.addComment(versionString, textAttributes); @@ -145,7 +145,7 @@ public class OrderEntryAppearanceServiceImpl extends OrderEntryAppearanceService if (!valid) { return SimpleTextAttributes.ERROR_ATTRIBUTES; } - else if (selected) { + else if (selected && !(SystemInfo.isWinVistaOrNewer && UIManager.getLookAndFeel().getName().contains("Windows"))) { return SimpleTextAttributes.SELECTED_SIMPLE_CELL_ATTRIBUTES; } else { diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java index a97e29839421..d252433b4399 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java @@ -27,6 +27,7 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.ui.OrderEntryAppearanceService; import com.intellij.openapi.ui.FixedSizeButton; import com.intellij.openapi.ui.TextFieldWithBrowseButton; +import com.intellij.openapi.util.SystemInfo; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.SimpleTextAttributes; @@ -177,7 +178,10 @@ public class AntUIUtil { if (jdk == null) { if (myProjectJdkName.length() > 0) { setIcon(AllIcons.General.Jdk); - append(AntBundle.message("project.jdk.project.jdk.name.list.column.value", myProjectJdkName), selected ? SimpleTextAttributes.SELECTED_SIMPLE_CELL_ATTRIBUTES : SimpleTextAttributes.SIMPLE_CELL_ATTRIBUTES); + append(AntBundle.message("project.jdk.project.jdk.name.list.column.value", myProjectJdkName), + selected && !(SystemInfo.isWinVistaOrNewer && UIManager.getLookAndFeel().getName().contains("Windows")) + ? SimpleTextAttributes.SELECTED_SIMPLE_CELL_ATTRIBUTES + : SimpleTextAttributes.SIMPLE_CELL_ATTRIBUTES); } else { setIcon(PlatformIcons.INVALID_ENTRY_ICON);