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

IJPL-158649 Main toolbar: fix popup place in case of existing last actions

Browse Source 
GitOrigin-RevId: 11fbd7ec3e4f29d914823a44ed026efb8151b721
This commit is contained in:
Aydar Mukhametzyanov
2025-01-14 14:33:16 +00:00
committed by intellij-monorepo-bot
parent e82c7f0d22
commit f808dcac58
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/actions/SettingsEntryPointAction.java
+12 -9
View File
@@ -56,7 +56,9 @@ import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CancellationException;
@@ -194,17 +196,18 @@ public final class SettingsEntryPointAction extends ActionGroup
ActionProvider.EP_NAME.getExtensionList(), o -> !o.getLastActions(context).isEmpty()) != null;
ListPopup popup;
String place = "SettingsEntryPoint";
if (eventPlace != null) {
place += "@" + eventPlace;
}
place = ActionPlaces.getPopupPlace(place);
if (hasLastActions && ExperimentalUI.isNewUI()) {
popup = new MyPopup(group, context, new PresentationFactory());
popup = new MyPopup(group, context, new PresentationFactory(), place);
}
else {
String place = "SettingsEntryPoint";
if (eventPlace != null) {
place += "@" + eventPlace;
}
popup = JBPopupFactory.getInstance().createActionGroupPopup(
null, group, context, ActionSelectionAid.MNEMONICS, true, ActionPlaces.getPopupPlace(place));
null, group, context, ActionSelectionAid.MNEMONICS, true, place);
}
popup.setShowSubmenuOnHover(true);
@@ -216,8 +219,8 @@ public final class SettingsEntryPointAction extends ActionGroup
final @NotNull PresentationFactory myPresentationFactory;
MyPopup(@NotNull ActionGroup group, @NotNull DataContext context, @NotNull PresentationFactory presentationFactory) {
super(null, null, group, context, ActionPlaces.POPUP, presentationFactory,
MyPopup(@NotNull ActionGroup group, @NotNull DataContext context, @NotNull PresentationFactory presentationFactory, @NotNull String place) {
super(null, null, group, context, place, presentationFactory,
ActionPopupOptions.mnemonicsAndDisabled(), null);
myPresentationFactory = presentationFactory;
}