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

ui: fix rendering of separators with text on toolbar

Browse Source 
* do not multiply `stringWidth` on HiDPI Linux

follow-up: 1e38c3fcb3
This commit is contained in:
Aleksey Pivovarov
2018-05-25 18:57:58 +03:00
parent 2a94bba791
commit 93573017e2
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
+22 -16
View File
@@ -983,8 +983,14 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickAct
@Override
public Dimension getPreferredSize() {
if (myOrientation == SwingConstants.HORIZONTAL) {
int separatorWidth = myText == null ? 0 : getFontMetrics(getFont()).stringWidth(myText) + JBUI.scale(4);
return JBUI.size(7 + separatorWidth, 24);
if (myText != null) {
FontMetrics fontMetrics = getFontMetrics(getFont());
return new JBDimension(JBUI.scale(9) + fontMetrics.stringWidth(myText) + JBUI.scale(4),
Math.max(fontMetrics.getHeight(), JBUI.scale(24)), true);
}
else {
return JBUI.size(7, 24);
}
}
else {
return JBUI.size(24, 7);
@@ -1004,22 +1010,22 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickAct
offset = ActionToolbarImpl.this.getWidth() - getMaxButtonWidth() - 1;
}
g.setColor(UIUtil.getSeparatorColor());
if (myOrientation == SwingConstants.HORIZONTAL) {
int y2 = ActionToolbarImpl.this.getHeight() - gap * 2 - offset;
LinePainter2D.paint((Graphics2D)g, center, gap, center, y2);
g.setColor(UIUtil.getSeparatorColor());
if (myOrientation == SwingConstants.HORIZONTAL) {
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);
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);
}
}
}