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

Allow Japanese in ChooseByName popup

Browse Source
This commit is contained in:
Anton Tarasov
2018-02-22 15:44:39 +03:00
parent 4f9dcba7ad
commit 8022345038
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+7 -1
View File
@@ -21,6 +21,8 @@ import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.colors.EditorFontType;
import com.intellij.openapi.editor.ex.util.EditorUtil;
import com.intellij.openapi.editor.impl.SettingsImpl;
import com.intellij.openapi.fileTypes.UnknownFileType;
@@ -40,6 +42,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.*;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.wm.IdeFocusManager;
@@ -448,7 +451,10 @@ public abstract class ChooseByNameBase {
.registerCustomShortcutSet(ActionManager.getInstance().getAction(IdeActions.ACTION_COPY).getShortcutSet(), myTextField);
myTextFieldPanel.add(myTextField);
Font editorFont = EditorUtil.getEditorFont();
// [tav] todo: UIUtil.getFontWithFallback() doesn't display Japanese on OSX
Font editorFont = SystemInfo.isMac ?
EditorColorsManager.getInstance().getGlobalScheme().getFont(EditorFontType.PLAIN) :
EditorUtil.getEditorFont();
myTextField.setFont(editorFont);
myTextField.putClientProperty("caretWidth", JBUI.scale(new SettingsImpl().getLineCursorWidth()));