From 99c76ea8b346d459846e94245f939c03e159c334 Mon Sep 17 00:00:00 2001 From: Ivan Bessonov Date: Thu, 28 Jan 2016 12:45:19 +0300 Subject: [PATCH] LabeledComponent's label width is calculated incorrectly if text contains 0x1B mnemonic instead of '&' --- .../src/com/intellij/openapi/ui/LabeledComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-api/src/com/intellij/openapi/ui/LabeledComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/LabeledComponent.java index bb86b9b238cf..14fa33fbccff 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/LabeledComponent.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/LabeledComponent.java @@ -181,7 +181,7 @@ public class LabeledComponent extends JPanel implements } public static TextWithMnemonic fromTextWithMnemonic(String textWithMnemonic) { - int mnemonicIndex = textWithMnemonic.indexOf('&'); + int mnemonicIndex = UIUtil.getDisplayMnemonicIndex(textWithMnemonic); if (mnemonicIndex == -1) { return new TextWithMnemonic(textWithMnemonic, -1); }