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

scale icons in completion popup according current editor settings

Browse Source
This commit is contained in:
Konstantin Bulenkov
2016-02-01 10:44:12 +01:00
parent ee119ae9df
commit bbbef84d7c
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupActionsStep.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@ public class LookupActionsStep extends BaseListPopupStep<LookupElementAction> im
@Override
public Icon getIconFor(LookupElementAction aValue) {
return LookupCellRenderer.augmentIcon(aValue.getIcon(), myEmptyIcon);
return LookupCellRenderer.augmentIcon(myLookup.getEditor(), aValue.getIcon(), myEmptyIcon);
}
@NotNull
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
+16 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,11 +23,13 @@ import com.intellij.codeInsight.lookup.RealLookupElementPresentation;
import com.intellij.openapi.application.AccessToken;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.colors.EditorColorsScheme;
import com.intellij.openapi.editor.colors.EditorFontType;
import com.intellij.openapi.editor.ex.util.EditorUtil;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.codeStyle.MinusculeMatcher;
import com.intellij.psi.codeStyle.NameUtil;
@@ -168,13 +170,17 @@ public class LookupCellRenderer implements ListCellRenderer {
}
myNameComponent.clear();
myNameComponent.setIcon(augmentIcon(presentation.getIcon(), myEmptyIcon));
myNameComponent.setBackground(background);
allowedWidth -= setItemTextLabel(item, new JBColor(isSelected ? SELECTED_FOREGROUND_COLOR : presentation.getItemTextForeground(), presentation.getItemTextForeground()), isSelected, presentation, allowedWidth);
Font customFont = myLookup.getCustomFont(item, false);
myTailComponent.setFont(customFont != null ? customFont : myNormalFont);
myTypeLabel.setFont(customFont != null ? customFont : myNormalFont);
Font font = myLookup.getCustomFont(item, false);
if (font == null) {
font = myNormalFont;
}
myTailComponent.setFont(font);
myTypeLabel.setFont(font);
myNameComponent.setIcon(augmentIcon(myLookup.getEditor(), presentation.getIcon(), myEmptyIcon));
myTypeLabel.clear();
if (allowedWidth > 0) {
@@ -411,7 +417,11 @@ public class LookupCellRenderer implements ListCellRenderer {
return used;
}
public static Icon augmentIcon(@Nullable Icon icon, @NotNull Icon standard) {
public static Icon augmentIcon(@Nullable Editor editor, @Nullable Icon icon, @NotNull Icon standard) {
if (Registry.is("editor.scale.completion.icons")) {
standard = EditorUtil.scaleIconAccordingEditorFont(standard, editor);
icon = EditorUtil.scaleIconAccordingEditorFont(icon, editor);
}
if (icon == null) {
return standard;
}