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-232707 refactor: move marketplaceSortByAction to MarketplaceSearchResultPanel, also pass sortGroup

Browse Source 
GitOrigin-RevId: 35ff86936d7424879e48f1baa50420df10321ee1
This commit is contained in:
Vadim Salavatov
2026-02-12 20:28:06 +00:00
committed by intellij-monorepo-bot
parent 861378865a
commit 188f231739
1 changed files with 67 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/plugins/MarketplacePluginsTab.java
+67 -58
View File
@@ -113,7 +113,6 @@ class MarketplacePluginsTab extends PluginsTab {
private Runnable myMarketplaceRunnable;
private final DefaultActionGroup myMarketplaceSortByGroup;
private LinkComponent myMarketplaceSortByAction;
private List<String> myTagsSorted;
private List<String> myVendorsSorted;
@@ -399,60 +398,6 @@ class MarketplacePluginsTab extends PluginsTab {
}
};
myMarketplaceSortByAction = new LinkComponent() {
@Override
protected boolean isInClickableArea(Point pt) {
return true;
}
@Override
public AccessibleContext getAccessibleContext() {
if (accessibleContext == null) {
accessibleContext = new AccessibleLinkComponent();
}
return accessibleContext;
}
protected class AccessibleLinkComponent extends AccessibleLinkLabel {
@Override
public AccessibleRole getAccessibleRole() {
return AccessibleRole.COMBO_BOX;
}
}
};
myMarketplaceSortByAction.setIcon(new Icon() {
@Override
public void paintIcon(Component c, Graphics g, int x, int y) {
getIcon().paintIcon(c, g, x, y + 1);
}
@Override
public int getIconWidth() {
return getIcon().getIconWidth();
}
@Override
public int getIconHeight() {
return getIcon().getIconHeight();
}
private static @NotNull Icon getIcon() {
return AllIcons.General.ButtonDropTriangle;
}
}); // TODO: icon
myMarketplaceSortByAction.setPaintUnderline(false);
myMarketplaceSortByAction.setIconTextGap(JBUIScale.scale(4));
myMarketplaceSortByAction.setHorizontalTextPosition(SwingConstants.LEFT);
myMarketplaceSortByAction.setForeground(PluginsGroupComponent.SECTION_HEADER_FOREGROUND);
//noinspection unchecked
myMarketplaceSortByAction.setListener(
(component, __) -> showRightBottomPopup(component.getParent().getParent(), IdeBundle.message("plugins.configurable.sort.by"),
myMarketplaceSortByGroup), null);
DumbAwareAction.create(event -> myMarketplaceSortByAction.doClick())
.registerCustomShortcutSet(KeyEvent.VK_DOWN, 0, myMarketplaceSortByAction);
MultiSelectionEventHandler eventHandler = new MultiSelectionEventHandler();
marketplaceController.setSearchResultEventHandler(eventHandler);
@@ -476,7 +421,8 @@ class MarketplacePluginsTab extends PluginsTab {
Project project = ProjectUtil.getActiveProject();
myMarketplaceSearchPanel = new MarketplaceSearchResultPanel(myCoroutineScope, marketplaceController, panel, project, selectionListener);
myMarketplaceSearchPanel = new MarketplaceSearchResultPanel(myCoroutineScope, marketplaceController, panel, project, selectionListener,
myMarketplaceSortByGroup);
return myMarketplaceSearchPanel;
}
@@ -759,15 +705,78 @@ class MarketplacePluginsTab extends PluginsTab {
private class MarketplaceSearchResultPanel extends SearchResultPanel {
private final Project myProject;
private final @NotNull Consumer<? super PluginsGroupComponent> mySelectionListener;
private final @NotNull DefaultActionGroup myMarketplaceSortByGroup;
private final @NotNull LinkComponent myMarketplaceSortByAction;
MarketplaceSearchResultPanel(CoroutineScope coroutineScope,
SearchUpDownPopupController marketplaceController,
PluginsGroupComponentWithProgress panel,
Project project,
@NotNull Consumer<? super PluginsGroupComponent> selectionListener) {
@NotNull Consumer<? super PluginsGroupComponent> selectionListener,
@NotNull DefaultActionGroup marketplaceSortByGroup) {
super(coroutineScope, marketplaceController, panel, true);
myProject = project;
mySelectionListener = selectionListener;
myMarketplaceSortByGroup = marketplaceSortByGroup;
myMarketplaceSortByAction = createSortByAction();
}
private @NotNull LinkComponent createSortByAction() {
LinkComponent sortByAction = new LinkComponent() {
@Override
protected boolean isInClickableArea(Point pt) {
return true;
}
@Override
public AccessibleContext getAccessibleContext() {
if (accessibleContext == null) {
accessibleContext = new AccessibleLinkComponent();
}
return accessibleContext;
}
protected class AccessibleLinkComponent extends AccessibleLinkLabel {
@Override
public AccessibleRole getAccessibleRole() {
return AccessibleRole.COMBO_BOX;
}
}
};
sortByAction.setIcon(new Icon() {
@Override
public void paintIcon(Component c, Graphics g, int x, int y) {
getIcon().paintIcon(c, g, x, y + 1);
}
@Override
public int getIconWidth() {
return getIcon().getIconWidth();
}
@Override
public int getIconHeight() {
return getIcon().getIconHeight();
}
private static @NotNull Icon getIcon() {
return AllIcons.General.ButtonDropTriangle;
}
}); // TODO: icon
sortByAction.setPaintUnderline(false);
sortByAction.setIconTextGap(JBUIScale.scale(4));
sortByAction.setHorizontalTextPosition(SwingConstants.LEFT);
sortByAction.setForeground(PluginsGroupComponent.SECTION_HEADER_FOREGROUND);
//noinspection unchecked
sortByAction.setListener(
(component, __) -> showRightBottomPopup(component.getParent().getParent(), IdeBundle.message("plugins.configurable.sort.by"),
myMarketplaceSortByGroup), null);
DumbAwareAction.create(event -> sortByAction.doClick())
.registerCustomShortcutSet(KeyEvent.VK_DOWN, 0, sortByAction);
return sortByAction;
}
@Override
@@ -925,4 +934,4 @@ class MarketplacePluginsTab extends PluginsTab {
searchIndex, pluginToScore);
}
}
}
}