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

IDEA-153645 SimpleColoredComponent should be aligned according to the specified border and Ipad

Browse Source
This commit is contained in:
Sergey Malenkov
2016-03-25 19:19:48 +03:00
parent c79021cc23
commit fde0e16923
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java
+11 -2
View File
@@ -428,6 +428,13 @@ public class SimpleColoredComponent extends JComponent implements Accessible, Co
return new Dimension(width, height);
}
private Rectangle computePaintArea() {
Rectangle area = new Rectangle(getWidth(), getHeight());
JBInsets.removeFrom(area, getInsets());
JBInsets.removeFrom(area, myIpad);
return area;
}
private int computeTextWidth(@NotNull Font font, final boolean mainTextOnly) {
int result = 0;
int baseSize = font.getSize();
@@ -748,7 +755,8 @@ public class SimpleColoredComponent extends JComponent implements Accessible, Co
offset += computeTextAlignShift(baseFont);
int baseSize = baseFont.getSize();
FontMetrics baseMetrics = g.getFontMetrics();
final int textBaseline = getTextBaseLine(baseMetrics, getHeight());
Rectangle area = computePaintArea();
final int textBaseline = area.y + getTextBaseLine(baseMetrics, area.height);
boolean wasSmaller = false;
for (int i = 0; i < myFragments.size(); i++) {
final SimpleTextAttributes attributes = myAttributes.get(i);
@@ -917,7 +925,8 @@ public class SimpleColoredComponent extends JComponent implements Accessible, Co
}
protected void paintIcon(@NotNull Graphics g, @NotNull Icon icon, int offset) {
icon.paintIcon(this, g, offset, (getHeight() - icon.getIconHeight()) / 2);
Rectangle area = computePaintArea();
icon.paintIcon(this, g, offset, area.y + (area.height - icon.getIconHeight()) / 2);
}
protected void applyAdditionalHints(@NotNull Graphics2D g) {