MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

UX-613 align descriptions by right side; provide descriptions for action based providers, e.g. rake/rails g

Browse Source 
GitOrigin-RevId: e493c070d7af32ab738907ddac2636adc8c1178c
This commit is contained in:
Dmitry.Krasilschikov
2019-05-29 18:10:17 +03:00
committed by intellij-monorepo-bot
parent 884617103b
commit f40373e469
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/runAnything/items/RunAnythingActionItem.java
+9
View File
@@ -8,12 +8,21 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
public class RunAnythingActionItem<T extends AnAction> extends RunAnythingItemBase {
@NotNull private final T myAction;
public RunAnythingActionItem(@NotNull T action, @NotNull String fullCommand, @Nullable Icon icon) {
super(fullCommand, icon);
myAction = action;
}
@NotNull
public static String getCommand(@NotNull AnAction action, @NotNull String command) {
return command + " " + (action.getTemplatePresentation().getText() != null ? action.getTemplatePresentation().getText() : "undefined");
}
@Nullable
@Override
public String getDescription() {
return myAction.getTemplatePresentation().getDescription();
}
}
platform/lang-impl/src/com/intellij/ide/actions/runAnything/items/RunAnythingItemBase.java
+15 -12
View File
@@ -8,7 +8,6 @@ import com.intellij.ui.SimpleTextAttributes;
import com.intellij.ui.speedSearch.SpeedSearchUtil;
import com.intellij.util.ObjectUtils;
import com.intellij.util.ui.EmptyIcon;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -16,7 +15,6 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import static com.intellij.openapi.util.text.StringUtil.shortenTextWithEllipsis;
import static com.intellij.ui.SimpleTextAttributes.*;
import static com.intellij.util.ui.UIUtil.getListSelectionForeground;
@@ -59,26 +57,31 @@ public class RunAnythingItemBase extends RunAnythingItem {
RunAnythingGroup.RUN_ANYTHING_MATCHER_BUILDER.fun(pattern).build(),
background,
isSelected);
component.add(textComponent, BorderLayout.CENTER);
component.add(BorderLayout.WEST, textComponent);
Icon icon = myIcon;
if (groupIcon == myIcon) {
icon = EmptyIcon.ICON_16;
}
JLabel iconLabel = new JLabel(icon);
iconLabel.setBorder(JBUI.Borders.emptyLeft(3));
component.add(iconLabel, BorderLayout.WEST);
String description = getDescription();
if (description != null) {
SimpleColoredComponent descriptionComponent = new SimpleColoredComponent();
descriptionComponent.append(" " + shortenTextWithEllipsis(description, 200, 0), getDescriptionAttributes(isSelected));
component.add(descriptionComponent, BorderLayout.EAST);
}
textComponent.setIcon(icon);
addDescription(component, isSelected);
return component;
}
private void addDescription(@NotNull JPanel panel, boolean isSelected) {
String description = getDescription();
if (description == null) {
return;
}
SimpleColoredComponent descriptionComponent = new SimpleColoredComponent();
descriptionComponent.append(description, getDescriptionAttributes(isSelected));
descriptionComponent.setTextAlign(SwingConstants.RIGHT);
panel.add(descriptionComponent, BorderLayout.CENTER);
}
public void setupIcon(@NotNull SimpleColoredComponent component, @Nullable Icon icon) {
component.setIcon(ObjectUtils.notNull(icon, EmptyIcon.ICON_16));
}