IDEA-169924 move editor colors from base implementation of Breadcrumbs

This commit is contained in:
Sergey Malenkov
2017-04-17 18:01:48 +03:00
parent 4f72cbce9d
commit d8a366e2de
2 changed files with 16 additions and 12 deletions
@@ -15,9 +15,6 @@
*/
package com.intellij.ui.components.breadcrumbs;
import com.intellij.openapi.editor.colors.EditorColors;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.editor.markup.EffectType;
import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.util.registry.Registry;
@@ -267,15 +264,7 @@ public class Breadcrumbs extends JComponent {
}
protected TextAttributes getAttributes(Crumb crumb) {
TextAttributesKey key = getKey(crumb);
return key == null ? null : EditorColorsManager.getInstance().getGlobalScheme().getAttributes(key);
}
protected TextAttributesKey getKey(Crumb crumb) {
if (isHovered(crumb)) return EditorColors.BREADCRUMBS_HOVERED;
if (isSelected(crumb)) return EditorColors.BREADCRUMBS_CURRENT;
if (isAfterSelected(crumb)) return EditorColors.BREADCRUMBS_INACTIVE;
return EditorColors.BREADCRUMBS_DEFAULT;
return null;
}
private Crumb getCrumb(int x, int y) {
@@ -17,6 +17,8 @@ package com.intellij.xml.breadcrumbs;
import com.intellij.openapi.editor.colors.EditorColors;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.ui.components.breadcrumbs.Breadcrumbs;
import com.intellij.ui.components.breadcrumbs.Crumb;
@@ -97,4 +99,17 @@ final class PsiBreadcrumbs extends Breadcrumbs {
return presentation.getBackgroundColor(isSelected(crumb), isHovered(crumb), isAfterSelected(crumb));
}
@Override
protected TextAttributes getAttributes(Crumb crumb) {
TextAttributesKey key = getKey(crumb);
return key == null ? null : EditorColorsManager.getInstance().getGlobalScheme().getAttributes(key);
}
private TextAttributesKey getKey(Crumb crumb) {
if (isHovered(crumb)) return EditorColors.BREADCRUMBS_HOVERED;
if (isSelected(crumb)) return EditorColors.BREADCRUMBS_CURRENT;
if (isAfterSelected(crumb)) return EditorColors.BREADCRUMBS_INACTIVE;
return EditorColors.BREADCRUMBS_DEFAULT;
}
}