IDEA-199876 Add keys: file colors

This commit is contained in:
Kirill Kirichenko
2018-10-11 16:36:31 +03:00
parent de95f90b01
commit 4ad622f9df
@@ -38,12 +38,12 @@ public class FileColorManagerImpl extends FileColorManager implements Persistent
private FileColorProjectLevelConfigurationManager myProjectLevelConfigurationManager;
private static final Map<String, Color> ourDefaultColors = ContainerUtil.<String, Color>immutableMapBuilder()
.put("Blue", new JBColor(new Color(0xdcf0ff), new Color(0x3C476B)))
.put("Green", new JBColor(new Color(231, 250, 219), new Color(0x425444)))
.put("Orange", new JBColor(new Color(246, 224, 202), new Color(0x804A33)))
.put("Rose", new JBColor(new Color(242, 206, 202), new Color(0x6E414E)))
.put("Violet", new JBColor(new Color(222, 213, 241), new Color(0x504157)))
.put("Yellow", new JBColor(new Color(255, 255, 228), new Color(0x4F4838)))
.put("Blue", JBColor.namedColor("FileColor.Blue", new JBColor(0xdcf0ff, 0x3C476B)))
.put("Green", JBColor.namedColor("FileColor.Green", new JBColor(0xe7fadb, 0x425444)))
.put("Orange", JBColor.namedColor("FileColor.Orange", new JBColor(0xf6e0ca, 0x804A33)))
.put("Rose", JBColor.namedColor("FileColor.Rose", new JBColor(0xf2ceca, 0x6E414E)))
.put("Violet", JBColor.namedColor("FileColor.Violet", new JBColor(0xded5f1, 0x504157)))
.put("Yellow", JBColor.namedColor("FileColor.Yellow", new JBColor(0xffffe4, 0x4F4838)))
.build();
public FileColorManagerImpl(@NotNull final Project project) {
@@ -120,7 +120,6 @@ public class FileColorManagerImpl extends FileColorManager implements Persistent
}
return ColorUtil.fromHex(name, null);
}
@Override
@@ -243,9 +242,6 @@ public class FileColorManagerImpl extends FileColorManager implements Persistent
}
static String getAlias(String text) {
if (UIUtil.isUnderDarcula()) {
if (text.equals("Yellow")) return "Brown";
}
return text;
return UIUtil.isUnderDarcula() && text.equals("Yellow") ? "Brown" : text;
}
}