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] respect scaling in vcs log filter components

Browse Source 
GitOrigin-RevId: 4a6a8e1ec8bff55570ec9073fd16b1a50a445231
This commit is contained in:
Julia Beliaeva
2020-06-17 16:35:14 +03:00
committed by intellij-monorepo-bot
parent 01aa4017b5
commit ab59d20bf2
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogPopupComponent.java
+22 -8
View File
@@ -18,7 +18,6 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.border.Border;
import javax.swing.border.LineBorder;
import java.awt.*;
import java.awt.event.*;
import java.awt.geom.Area;
@@ -170,15 +169,17 @@ public abstract class VcsLogPopupComponent extends JPanel {
}
private static Border createUnfocusedBorder() {
return BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE),
JBUI.Borders.empty(2));
return BorderFactory.createCompoundBorder(JBUI.Borders.empty(BORDER_SIZE), JBUI.Borders.empty(2));
}
private static class FilledRoundedBorder extends LineBorder {
private static class FilledRoundedBorder implements Border {
private final Color myColor;
private final int myThickness;
private final int myArcSize;
FilledRoundedBorder(@NotNull Color color, int arcSize, int thickness) {
super(color, thickness);
myColor = color;
myThickness = thickness;
myArcSize = arcSize;
}
@@ -186,9 +187,12 @@ public abstract class VcsLogPopupComponent extends JPanel {
public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
GraphicsConfig config = GraphicsUtil.setupAAPainting(g);
g.setColor(lineColor);
Area area = new Area(new RoundRectangle2D.Double(x, y, width, height, myArcSize, myArcSize));
int innerArc = Math.max(myArcSize - thickness, 0);
g.setColor(myColor);
int thickness = JBUI.scale(myThickness);
int arcSize = JBUI.scale(myArcSize);
Area area = new Area(new RoundRectangle2D.Double(x, y, width, height, arcSize, arcSize));
int innerArc = Math.max(arcSize - thickness, 0);
area.subtract(new Area(new RoundRectangle2D.Double(x + thickness, y + thickness,
width - 2 * thickness, height - 2 * thickness,
innerArc, innerArc)));
@@ -196,6 +200,16 @@ public abstract class VcsLogPopupComponent extends JPanel {
config.restore();
}
@Override
public Insets getBorderInsets(Component c) {
return JBUI.insets(myThickness);
}
@Override
public boolean isBorderOpaque() {
return false;
}
}
private static class DynamicLabel extends JLabel {