Skip to content
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

Jump to bottom

Fix line numbers alignment and change default padding to spaces. #488 #489

Merged
merged 2 commits into from
Apr 14, 2017
Merged

Fix line numbers alignment and change default padding to spaces. #488 #489

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b9e6e7
Top align for line numbers (important when text wrapping enabled)
AlexP11223 Apr 14, 2017
191d430
Pad line numbers with spaces instead of zeros by default
AlexP11223 Apr 14, 2017
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
4 changes: 3 additions & 1 deletion richtextfx/src/main/java/org/fxmisc/richtext/LineNumberFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.function.IntFunction;

import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.layout.Background;
Expand All @@ -29,7 +30,7 @@ public class LineNumberFactory implements IntFunction<Node> {
new Background(new BackgroundFill(Color.web("#ddd"), null, null));

public static IntFunction<Node> get(GenericStyledArea<?, ?, ?> area) {
return get(area, digits -> "%0" + digits + "d");
return get(area, digits -> "%1$" + digits + "s");
}

public static IntFunction<Node> get(
Expand Down Expand Up @@ -57,6 +58,7 @@ public Node apply(int idx) {
lineNo.setBackground(DEFAULT_BACKGROUND);
lineNo.setTextFill(DEFAULT_TEXT_FILL);
lineNo.setPadding(DEFAULT_INSETS);
lineNo.setAlignment(Pos.TOP_RIGHT);
lineNo.getStyleClass().add("lineno");

// bind label's text to a Val that stops observing area's paragraphs
Expand Down