From a32eba730259d3097212e3787772b07ccd3d36fc Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Tue, 7 Jul 2015 17:29:45 +0300 Subject: [PATCH] - use editor font in implements/override popup - use correct font size in presentation mode --- .../daemon/impl/PsiElementListNavigator.java | 6 ++++++ .../ide/util/NavigationItemListCellRenderer.java | 7 +------ .../ide/util/gotoByName/ChooseByNameBase.java | 12 ++++++++---- .../ide/util/gotoByName/GotoFileCellRenderer.java | 10 ++-------- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java index 4eeca2b71704..7e2d15f2affc 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java @@ -20,6 +20,7 @@ import com.intellij.codeInsight.navigation.ListBackgroundUpdaterTask; import com.intellij.find.FindUtil; import com.intellij.ide.PsiCopyPasteManager; import com.intellij.ide.util.PsiElementListCellRenderer; +import com.intellij.ide.util.gotoByName.ChooseByNameBase; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.progress.ProgressManager; @@ -127,6 +128,7 @@ public class PsiElementListNavigator { }); list.setCellRenderer(listRenderer); + list.setFont(ChooseByNameBase.getEditorFont()); final PopupChooserBuilder builder = new PopupChooserBuilder(list); if (listRenderer instanceof PsiElementListCellRenderer) { @@ -167,6 +169,10 @@ public class PsiElementListNavigator { } final JBPopup popup = popupChooserBuilder.createPopup(); + + builder.getScrollPane().setBorder(null); + builder.getScrollPane().setViewportBorder(null); + if (listUpdaterTask != null) { listUpdaterTask.init((AbstractPopup)popup, list, usageView); diff --git a/platform/lang-impl/src/com/intellij/ide/util/NavigationItemListCellRenderer.java b/platform/lang-impl/src/com/intellij/ide/util/NavigationItemListCellRenderer.java index a8cc1658ab3f..a426f88f3b8d 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/NavigationItemListCellRenderer.java +++ b/platform/lang-impl/src/com/intellij/ide/util/NavigationItemListCellRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2015 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. @@ -22,8 +22,6 @@ import com.intellij.navigation.NavigationItem; import com.intellij.navigation.NavigationItemFileStatus; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; -import com.intellij.openapi.editor.colors.EditorColorsManager; -import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.markup.EffectType; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.project.Project; @@ -63,9 +61,6 @@ public class NavigationItemListCellRenderer extends OpaquePanel implements ListC int index, boolean isSelected, boolean cellHasFocus) { - EditorColorsScheme scheme = EditorColorsManager.getInstance().getGlobalScheme(); - Font editorFont = new Font(scheme.getEditorFontName(), Font.PLAIN, scheme.getEditorFontSize()); - setFont(editorFont); removeAll(); final boolean hasRightRenderer = UISettings.getInstance().SHOW_ICONS_IN_QUICK_NAVIGATION; diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java index 40b722c51e6f..84973b89ab04 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java @@ -486,10 +486,7 @@ public abstract class ChooseByNameBase { myTextField.setActionMap(actionMap); myTextFieldPanel.add(myTextField); - EditorColorsScheme scheme = EditorColorsManager.getInstance().getGlobalScheme(); - boolean presentationMode = UISettings.getInstance().PRESENTATION_MODE; - int size = presentationMode ? UISettings.getInstance().PRESENTATION_MODE_FONT_SIZE - 4 : scheme.getEditorFontSize(); - Font editorFont = new Font(scheme.getEditorFontName(), Font.PLAIN, size); + Font editorFont = getEditorFont(); myTextField.setFont(editorFont); if (checkBoxName != null) { @@ -1779,4 +1776,11 @@ public abstract class ChooseByNameBase { public JTextField getTextField() { return myTextField; } + + public static Font getEditorFont() { + EditorColorsScheme scheme = EditorColorsManager.getInstance().getGlobalScheme(); + int size = UISettings.getInstance().PRESENTATION_MODE + ? UISettings.getInstance().PRESENTATION_MODE_FONT_SIZE - 4 : scheme.getEditorFontSize(); + return new Font(scheme.getEditorFontName(), Font.PLAIN, size); + } } diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileCellRenderer.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileCellRenderer.java index 108868ccd192..2fe7b4bb3bbc 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileCellRenderer.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileCellRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2015 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. @@ -20,8 +20,6 @@ import com.intellij.ide.util.PlatformModuleRendererFactory; import com.intellij.ide.util.PsiElementListCellRenderer; import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.NavigationItem; -import com.intellij.openapi.editor.colors.EditorColorsManager; -import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectFileIndex; @@ -60,11 +58,7 @@ public class GotoFileCellRenderer extends PsiElementListCellRenderer