From 695b6187ac523ce551b2fc6bee2120b6d4ce0df7 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Tue, 4 May 2021 17:47:03 +0300 Subject: [PATCH] IDEA-268511: ExpandableTextField#setMonospaced(true) should use editor font instead of system one GitOrigin-RevId: 5d2c21d74fc105093cbc9e0ee0bb8327e25ca3f8 --- .../ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java index d71545ca016c..4ba81435bf9b 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java @@ -1,17 +1,16 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ide.ui.laf.darcula.ui; import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.ui.laf.darcula.DarculaUIUtil; +import com.intellij.openapi.editor.ex.util.EditorUtil; import com.intellij.openapi.keymap.KeymapUtil; -import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.SystemInfo; import com.intellij.ui.ComponentUtil; import com.intellij.ui.components.fields.ExtendableTextComponent; import com.intellij.ui.components.fields.ExtendableTextComponent.Extension; -import com.intellij.ui.popup.PopupState; import com.intellij.ui.scale.JBUIScale; import com.intellij.util.ui.JBInsets; import com.intellij.util.ui.JBUI; @@ -24,7 +23,6 @@ import org.jetbrains.annotations.TestOnly; import javax.swing.*; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import javax.swing.plaf.FontUIResource; import javax.swing.plaf.UIResource; import javax.swing.plaf.basic.BasicTextFieldUI; import javax.swing.text.*; @@ -570,7 +568,7 @@ public abstract class TextFieldWithPopupHandlerUI extends BasicTextFieldUI imple font = UIManager.getFont(getPropertyPrefix() + ".font"); component.setFont(!monospaced ? !SystemInfo.isMacOSCatalina ? font : disableKerning(font) - : new FontUIResource(Font.MONOSPACED, font.getStyle(), font.getSize())); + : EditorUtil.getEditorFont(font.getSize())); } } }