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

Support separators with text in horizontal toolbars

Browse Source
This commit is contained in:
Dmitry Jemerov
2018-05-15 19:47:09 +02:00
parent 1f2dc1f963
commit 1e38c3fcb3
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
+26 -4
View File
@@ -5,6 +5,7 @@ import com.intellij.icons.AllIcons;
import com.intellij.ide.DataManager;
import com.intellij.ide.HelpTooltip;
import com.intellij.ide.impl.DataManagerImpl;
import com.intellij.ide.ui.UISettings;
import com.intellij.internal.statistic.collectors.fus.ui.persistence.ToolbarClicksCollector;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
@@ -290,7 +291,7 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickAct
final List<AnAction> rightAligned = new ArrayList<>();
boolean isLastElementSeparator = false;
if (myAddSeparatorFirst) {
add(new MySeparator());
add(new MySeparator(null));
isLastElementSeparator = true;
}
for (int i = 0; i < actions.size(); i++) {
@@ -310,7 +311,7 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickAct
if (action instanceof Separator) {
if (isLastElementSeparator) continue;
if (i > 0 && i < actions.size() - 1) {
add(new MySeparator());
add(new MySeparator(((Separator) action).getText()));
isLastElementSeparator = true;
continue;
}
@@ -972,9 +973,21 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickAct
}
private final class MySeparator extends JComponent {
private final String myText;
private MySeparator(String text) {
myText = text;
}
@Override
public Dimension getPreferredSize() {
return (myOrientation == SwingConstants.HORIZONTAL) ? JBUI.size(7, 24) : JBUI.size(24, 7);
if (myOrientation == SwingConstants.HORIZONTAL) {
int separatorWidth = myText == null ? 0 : getFontMetrics(getFont()).stringWidth(myText) + JBUI.scale(4);
return JBUI.size(7 + separatorWidth, 24);
}
else {
return JBUI.size(24, 7);
}
}
@Override
@@ -992,7 +1005,16 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickAct
g.setColor(UIUtil.getSeparatorColor());
if (myOrientation == SwingConstants.HORIZONTAL) {
LinePainter2D.paint((Graphics2D)g, center, gap, center, ActionToolbarImpl.this.getHeight() - gap * 2 - offset);
int y2 = ActionToolbarImpl.this.getHeight() - gap * 2 - offset;
LinePainter2D.paint((Graphics2D)g, center, gap, center, y2);
if (myText != null) {
FontMetrics fontMetrics = getFontMetrics(getFont());
int top = (getHeight() - fontMetrics.getHeight()) / 2;
UISettings.setupAntialiasing(g);
g.setColor(JBColor.foreground());
g.drawString(myText, JBUI.scale(9), top + fontMetrics.getAscent());
}
}
else {
LinePainter2D.paint((Graphics2D)g, gap, center, ActionToolbarImpl.this.getWidth() - gap * 2 - offset, center);