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

CWM-8390 fix NPE

Browse Source 
GitOrigin-RevId: f87c3be69e1569d7f033494dc3ee8c515a9a3649
This commit is contained in:
Alexander.Kass
2023-07-20 12:12:59 +00:00
committed by intellij-monorepo-bot
parent 5d19cf1058
commit 3c7f7a2fe5
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/popup/list/PopupListElementRenderer.java
+11 -5
View File
@@ -32,7 +32,7 @@ public class PopupListElementRenderer<E> extends GroupedItemsListRenderer<E> {
public static final Key<@NlsSafe String> CUSTOM_KEY_STROKE_TEXT = new Key<>("CUSTOM_KEY_STROKE_TEXT");
protected final ListPopupImpl myPopup;
private JLabel myShortcutLabel;
private @Nullable JLabel myShortcutLabel;
private @Nullable JLabel myValueLabel;
protected JLabel myMnemonicLabel;
protected JLabel myIconLabel;
@@ -296,12 +296,18 @@ public class PopupListElementRenderer<E> extends GroupedItemsListRenderer<E> {
int leftRightInset = JBUI.CurrentTheme.Popup.Selection.LEFT_RIGHT_INSET.get();
Insets innerInsets = JBUI.CurrentTheme.Popup.Selection.innerInsets();
int extra = hasNextIcon || hasInlineButtons ? leftRightInset - myButtonsSeparator.getPreferredSize().width : leftRightInset;
//noinspection UseDPIAwareBorders
myShortcutLabel.setBorder(new EmptyBorder(0, 0, 0, extra));
int expectedRightInset = leftRightInset * 2;
if (hasNextIcon || hasInlineButtons) {
expectedRightInset -= myButtonsSeparator.getPreferredSize().width;
}
if (myShortcutLabel != null) {
//noinspection UseDPIAwareBorders
myShortcutLabel.setBorder(new EmptyBorder(0, 0, 0, expectedRightInset - leftRightInset));
expectedRightInset = leftRightInset;
}
//noinspection UseDPIAwareBorders
selectablePanel.setBorder(
new EmptyBorder(0, innerInsets.left + leftRightInset, 0, leftRightInset));
new EmptyBorder(0, innerInsets.left + leftRightInset, 0, expectedRightInset));
}
if (step instanceof BaseListPopupStep) {