Skip to content

Improve diff display (anti-aliasing for conflict view and incomplete drawing of diff border) #9002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthiasblaesing merged 3 commits into from
Nov 22, 2025
Merged

Improve diff display (anti-aliasing for conflict view and incomplete drawing of diff border) #9002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
124fa49
Diff: Fix NetBeans warnings in LineNumbersActionsBar + LinesComponent
matthiasblaesing Nov 10, 2025
4a2b4af
Diff: Enable anti-aliasing for conflict resolver UI
matthiasblaesing Nov 10, 2025
b31b649
Diff: Fix partitial redrawing of change delimiter line after hover ov…
matthiasblaesing Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 49 additions & 45 deletions ide/diff/src/org/netbeans/modules/diff/builtin/visualizer/LinesComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
import org.netbeans.api.editor.settings.AttributesUtilities;
import org.netbeans.api.editor.settings.FontColorNames;
import org.netbeans.api.editor.settings.FontColorSettings;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;

import org.netbeans.editor.Coloring;
import org.netbeans.editor.EditorUI;
import org.netbeans.editor.FontMetricsCache;
import org.netbeans.lib.editor.util.swing.DocumentUtilities;
import org.openide.awt.GraphicsUtils;
import org.openide.util.WeakListeners;

/** GlyphGutter is component for displaying line numbers and annotation
Expand All @@ -60,51 +60,52 @@

public class LinesComponent extends JComponent implements javax.accessibility.Accessible, PropertyChangeListener {


/** Document to which this gutter is attached*/
private JEditorPane editorPane;
private final JEditorPane editorPane;

private final EditorUI editorUI;

private EditorUI editorUI;

/** Backroung color of the gutter */
private Color backgroundColor;

/** Foreground color of the gutter. Used for drawing line numbers. */
private Color foreColor;

/** Font used for drawing line numbers */
private Font font;

/** Flag whther the gutter was initialized or not. The painting is disabled till the
* gutter is not initialized */
private boolean init;

/** Width of the column used for drawing line numbers. The value contains
* also line number margins. */
private int numberWidth;

/** Whether the line numbers are shown or not */
private boolean showLineNumbers = true;

/** The gutter height is enlarged by number of lines which specifies this constant */
private static final int ENLARGE_GUTTER_HEIGHT = 300;

/** The hightest line number. This value is used for calculating width of the gutter */
private int highestLineNumber = 0;

/** Holds value of property lineNumberMargin. */
private Insets lineNumberMargin;

/** Holds value of property lineNumberDigitWidth. */
private int lineNumberDigitWidth;

private LinkedList<String> linesList;

/** Holds value of property activeLine. */
private int activeLine = -1;

private static final long serialVersionUID = -4861542695772182147L;


@SuppressWarnings({"LeakingThisInConstructor", "OverridableMethodCallInConstructor"})
public LinesComponent(JEditorPane pane) {
super();
init = false;
Expand Down Expand Up @@ -139,18 +140,18 @@ protected void init() {
getAccessibleContext().setAccessibleName(NbBundle.getMessage(LinesComponent.class, "ACSN_Lines_Component")); // NOI18N
getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(LinesComponent.class, "ACSD_Lines_Component")); // NOI18N
}

private void createLines() {
linesList = new LinkedList<String>();
linesList = new LinkedList<>();
int lineCnt;
StyledDocument doc = (StyledDocument)editorPane.getDocument();
int lastOffset = doc.getEndPosition().getOffset();
lineCnt = org.openide.text.NbDocument.findLineNumber(doc, lastOffset);
lineCnt = org.openide.text.NbDocument.findLineNumber(doc, lastOffset);
for (int i = 0; i < lineCnt; i++) {
linesList.add(Integer.toString(i + 1));
}
}

public void addEmptyLines(int line, int count) {
boolean appending = line > linesList.size();
for (int i = 0; i < count; i++) {
Expand All @@ -161,11 +162,12 @@ public void addEmptyLines(int line, int count) {
}
}
}

/**
* Insert line numbers. If at the end, then line numbers are added to the end of the component.
* If in the middle, subsequent lines are overwritten.
*/
@SuppressWarnings("AssignmentToMethodParameter")
public void insertNumbers(int line, int startNum, int count) {
boolean appending = line >= linesList.size();
if (appending) {
Expand All @@ -183,7 +185,7 @@ public void insertNumbers(int line, int startNum, int count) {
}
}
}

/*
* Test method.
*
Expand All @@ -196,12 +198,13 @@ private void dumpResultLineNumbers() {
System.out.println("");
}
*/

/**
* Remove line numbers and leave the corresponding part of the lines component empty.
* If at the end, then an empty space is added to the end of the component.
* If in the middle, subsequent lines are overwritten by an empty space.
*/
@SuppressWarnings("AssignmentToMethodParameter")
public void removeNumbers(int line, int count) {
boolean appending = line >= linesList.size();
if (appending) {
Expand All @@ -219,7 +222,7 @@ public void removeNumbers(int line, int count) {
}
}
}

/**
* Shrink the component, so that it will have <code>numLines</code> number of lines.
* @param numLines The new number of lines
Expand All @@ -229,7 +232,7 @@ public void shrink(int numLines) {
linesList.remove(numLines);
}
}

/** Update colors, fonts, sizes and invalidate itself. This method is
* called from EditorUI.update() */
private void updateState(Graphics g) {
Expand All @@ -239,11 +242,11 @@ private void updateState(Graphics g) {
Coloring col = Coloring.fromAttributeSet(AttributesUtilities.createComposite(
fcs.getFontColors(FontColorNames.LINE_NUMBER_COLORING),
fcs.getFontColors(FontColorNames.DEFAULT_COLORING)));

foreColor = col.getForeColor();
backgroundColor = col.getBackColor();
//System.out.println(" => foreground = "+foreColor+", background = "+backgroundColor);

font = col.getFont();
FontMetrics fm = g.getFontMetrics(font);
/*
Expand Down Expand Up @@ -288,19 +291,19 @@ private void updateState(Graphics g) {
setLineNumberDigitWidth(maxWidth);
// System.out.println("maxwidth=" + maxWidth);
// System.out.println("numner of lines=" + highestLineNumber);

resize();
}

protected void resize() {
Dimension dim = new Dimension();
// System.out.println("resizing...................");
dim.width = getWidthDimension();
dim.height = getHeightDimension();
// enlarge the gutter so that inserting new lines into
// enlarge the gutter so that inserting new lines into
Copy link
Copy Markdown

@donphelix donphelix Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@matthiasblaesing nitpick: let's only use comments when necessary

Copy link
Copy Markdown
Contributor

@eirikbakke eirikbakke Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a whitespace edit only.

Copy link
Copy Markdown

@donphelix donphelix Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eirikbakke The PR is larger than needed due to formatting changes in unrelated sections. Please limit edits to only the necessary functional changes to avoid cascading reformatting by future contributors.

cc @matthiasblaesing

// document does not cause resizing too often
dim.height += ENLARGE_GUTTER_HEIGHT * editorUI.getLineHeight();

numberWidth = getLineNumberWidth();
setPreferredSize(dim);

Expand Down Expand Up @@ -330,14 +333,14 @@ protected int getLineNumberWidth() {

protected int getWidthDimension() {
int newWidth = 0;

if (showLineNumbers) {
newWidth += getLineNumberWidth();
}

return newWidth;
}

protected int getHeightDimension() {
/*TEMP+ (int)editorPane.getSize().getHeight() */
View rootView = org.netbeans.editor.Utilities.getDocumentView(editorPane);
Expand All @@ -355,23 +358,24 @@ protected int getHeightDimension() {
}
return height;
}

/** Paint the gutter itself */
public @Override void paintComponent(Graphics g) {

super.paintComponent(g);
if (!init) {
updateState(g);
}
// return;


GraphicsUtils.configureDefaultRenderingHints(g);

Rectangle drawHere = g.getClipBounds();

// Fill clipping area with dirty brown/orange.
g.setColor(backgroundColor);
g.fillRect(drawHere.x, drawHere.y, drawHere.width, drawHere.height);

g.setFont(font);
g.setFont(font);
g.setColor(foreColor);

FontMetrics fm = FontMetricsCache.getFontMetrics(font, this);
Expand Down Expand Up @@ -418,18 +422,17 @@ protected int getHeightDimension() {
String activeSymbol = "*"; //NOI18N
int lineNumberWidth = fm.stringWidth(lineStr);
if (line == activeLine - 1) {
lineStr = lineStr + activeSymbol;
lineStr += activeSymbol;
}
int activeSymbolWidth = fm.stringWidth(activeSymbol);
lineNumberWidth = lineNumberWidth + activeSymbolWidth;
lineNumberWidth += activeSymbolWidth;
g.drawString(lineStr, numberWidth - lineNumberWidth - rightMargin, y + lineAscent);
}

y += (int) (rec2.getY() + rec2.getHeight() - rec1.getY());
line++;
}
} catch (BadLocationException ex) {
return;
}
}

Expand Down Expand Up @@ -462,49 +465,50 @@ protected void checkSize() {
resize();
}
}

/** Getter for property lineNumberMargin.
* @return Value of property lineNumberMargin.
*/
public Insets getLineNumberMargin() {
return this.lineNumberMargin;
}

/** Setter for property lineNumberMargin.
* @param lineNumberMargin New value of property lineNumberMargin.
*/
public void setLineNumberMargin(Insets lineNumberMargin) {
this.lineNumberMargin = lineNumberMargin;
}

/** Getter for property lineNumberDigitWidth.
* @return Value of property lineNumberDigitWidth.
*/
public int getLineNumberDigitWidth() {
return this.lineNumberDigitWidth;
}

/** Setter for property lineNumberDigitWidth.
* @param lineNumberDigitWidth New value of property lineNumberDigitWidth.
*/
public void setLineNumberDigitWidth(int lineNumberDigitWidth) {
this.lineNumberDigitWidth = lineNumberDigitWidth;
}

/** Getter for property activeLine.
* @return Value of property activeLine.
*/
public int getActiveLine() {
return this.activeLine;
}

/** Setter for property activeLine.
* @param activeLine New value of property activeLine.
*/
public void setActiveLine(int activeLine) {
this.activeLine = activeLine;
}

@Override
public void propertyChange(PropertyChangeEvent evt) {
init = false;
repaint();
Expand Down
Loading
Loading