MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

| current is back

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-10-02 14:00:02 +03:00
parent 35c6788f3f
commit cd2ea30676
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/actions/ShowUsagesTableCellRenderer.java
+21 -12
View File
@@ -96,17 +96,20 @@ class ShowUsagesTableCellRenderer implements TableCellRenderer {
return textComponentSpanningWholeRow(textChunks, rowBackground, rowForeground, column, list);
}
JPanel panel = new JPanel(new FlowLayout(column == LINE_NUMBER_COL ? FlowLayout.RIGHT : FlowLayout.LEFT, 0, 0) {
// want to be able to right-align the "current" word
LayoutManager layout = column == USAGE_TEXT_COL
? new BorderLayout() : new FlowLayout(column == LINE_NUMBER_COL ? FlowLayout.RIGHT : FlowLayout.LEFT, 0, 0) {
@Override
public void layoutContainer(Container container) {
super.layoutContainer(container);
for (Component component: container.getComponents()) { // align inner components
for (Component component : container.getComponents()) { // align inner components
Rectangle b = component.getBounds();
Insets insets = container.getInsets();
component.setBounds(b.x, b.y, b.width, container.getSize().height - insets.top - insets.bottom);
}
}
});
};
JPanel panel = new JPanel(layout);
panel.setFont(null);
// greying the current usage the "find usages" was originated from
@@ -132,7 +135,7 @@ class ShowUsagesTableCellRenderer implements TableCellRenderer {
case FILE_GROUP_COL:
appendGroupText(list, (GroupNode)usageNode.getParent(), panel, fileBgColor, isSelected);
break;
case LINE_NUMBER_COL: {
case LINE_NUMBER_COL:
if (text.length != 0) {
TextChunk chunk = text[0];
textChunks.append(chunk.getText(), getAttributes(isSelected, fileBgColor, selectionBg, selectionFg, chunk));
@@ -141,9 +144,8 @@ class ShowUsagesTableCellRenderer implements TableCellRenderer {
panel.add(textChunks);
break;
}
case USAGE_TEXT_COL: {
case USAGE_TEXT_COL:
Icon icon = presentation.getIcon();
textChunks.setIcon(icon == null ? EmptyIcon.ICON_16 : icon);
textChunks.append("").appendTextPadding(JBUI.scale(16 + 5));
@@ -154,8 +156,20 @@ class ShowUsagesTableCellRenderer implements TableCellRenderer {
SpeedSearchUtil.applySpeedSearchHighlighting(list, textChunks, false, isSelected);
panel.add(textChunks);
if (isOriginUsage) {
SimpleColoredComponent origin = new SimpleColoredComponent();
origin.setIconTextGap(JBUI.scale(5)); // for this particular icon it looks better
// use attributes of "line number" to show "Current" word
SimpleTextAttributes attributes =
text.length == 0 ? SimpleTextAttributes.REGULAR_ATTRIBUTES.derive(-1, new Color(0x808080), null, null) :
getAttributes(isSelected, fileBgColor, selectionBg, selectionFg, text[0]);
origin.append("| Current", attributes);
origin.appendTextPadding(JBUI.scale(45));
panel.add(origin, BorderLayout.EAST);
}
break;
}
default:
throw new IllegalStateException("unknown column: " + column);
@@ -171,11 +185,6 @@ class ShowUsagesTableCellRenderer implements TableCellRenderer {
ColorUtil.hackBrightness(back, 1, 1/1.05f); // Olga insisted on very-pale almost invisible gray. oh well
}
//@NotNull
//private static Icon slightlyDifferentColor(@NotNull Icon icon) {
// return EditorColorsManager.getInstance().isDarkEditor() ? IconUtil.brighter(icon, 3) : IconUtil.darker(icon, 8);
//}
@NotNull
private static SimpleTextAttributes getAttributes(boolean isSelected, Color fileBgColor, Color selectionBg, Color selectionFg, @NotNull TextChunk chunk) {
SimpleTextAttributes background = chunk.getSimpleAttributesIgnoreBackground();