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

[vcs-log] fix right padding in non-compact mode

Browse Source
This commit is contained in:
Julia Beliaeva
2016-12-13 19:27:50 +03:00
parent 4d7afe1e60
commit 36199b43df
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/LabelPainter.java
+6 -6
View File
@@ -60,7 +60,7 @@ import java.util.Map;
public class LabelPainter {
public static final int TOP_TEXT_PADDING = JBUI.scale(1);
public static final int BOTTOM_TEXT_PADDING = JBUI.scale(2);
public static final int RIGHT_PADDING = JBUI.scale(2);
public static final int RIGHT_PADDING = JBUI.scale(4);
public static final int LEFT_PADDING = JBUI.scale(2);
public static final int COMPACT_MIDDLE_PADDING = JBUI.scale(2);
public static final int MIDDLE_PADDING = JBUI.scale(6);
@@ -155,7 +155,7 @@ public class LabelPainter {
for (RefGroup group : refGroups) {
List<Color> colors = group.getColors();
LabelIcon labelIcon = new LabelIcon(height, background, colors.toArray(new Color[colors.size()]));
int newWidth = width + labelIcon.getIconWidth() + COMPACT_MIDDLE_PADDING;
int newWidth = width + labelIcon.getIconWidth() + (group != ContainerUtil.getLastItem(refGroups) ? COMPACT_MIDDLE_PADDING : 0);
String text = shortenRefName(group.getName(), fontMetrics, availableWidth - newWidth);
newWidth += fontMetrics.stringWidth(text);
@@ -184,12 +184,12 @@ public class LabelPainter {
int doNotFitWidth = 0;
if (i < refGroups.size() - 1) {
LabelIcon lastIcon = new LabelIcon(height, background, getColors(refGroups.subList(i + 1, refGroups.size())));
doNotFitWidth = lastIcon.getIconWidth() + MIDDLE_PADDING;
doNotFitWidth = lastIcon.getIconWidth();
}
List<Color> colors = group.getColors();
LabelIcon labelIcon = new LabelIcon(height, background, colors.toArray(new Color[colors.size()]));
int newWidth = width + labelIcon.getIconWidth() + MIDDLE_PADDING;
int newWidth = width + labelIcon.getIconWidth() + (i != refGroups.size() - 1 ? MIDDLE_PADDING : 0);
String text = getGroupText(group, fontMetrics, availableWidth - newWidth - doNotFitWidth);
newWidth += fontMetrics.stringWidth(text);
@@ -198,7 +198,7 @@ public class LabelPainter {
LabelIcon lastIcon = new LabelIcon(height, background, getColors(refGroups.subList(i, refGroups.size())));
String name = labels.isEmpty() ? text : "";
labels.add(Pair.create(name, lastIcon));
width += fontMetrics.stringWidth(name) + lastIcon.getIconWidth() + MIDDLE_PADDING;
width += fontMetrics.stringWidth(name) + lastIcon.getIconWidth();
break;
}
else {
@@ -321,7 +321,7 @@ public class LabelPainter {
if (myGreyBackground != null) {
g2.setColor(myGreyBackground);
g2.fillRect(x, y + baseLine - fontMetrics.getAscent() - TOP_TEXT_PADDING,
myWidth - RIGHT_PADDING + LEFT_PADDING,
myWidth,
fontMetrics.getHeight() + TOP_TEXT_PADDING + BOTTOM_TEXT_PADDING);
}