Skip to content

java9 tweak #888

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
Jugen merged 1 commit into from
Jan 2, 2020
Merged

java9 tweak #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions richtextfx/src/main/java9/org/fxmisc/richtext/TextFlowExt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ int getLineStartPosition(int charIdx) {

int getLineEndPosition(int charIdx) {
TwoLevelNavigator navigator = textLayout().getTwoLevelNavigator();
int currentLineIndex = navigator.offsetToPosition(charIdx, Forward).getMajor();
int minor = (currentLineIndex == getLineCount() - 1) ? 0 : -1;
return navigator.position(currentLineIndex + 1, minor).toOffset();
int currentLineIndex = navigator.offsetToPosition(charIdx, Forward).getMajor() + 1;
int minor = (currentLineIndex == getLineCount()) ? 0 : -1;
return navigator.position(currentLineIndex, minor).toOffset();
}

int getLineOfCharacter(int charIdx) {
Expand Down
3 changes: 2 additions & 1 deletion richtextfx/src/main/java9/org/fxmisc/richtext/TextFlowLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ TwoLevelNavigator getTwoLevelNavigator() {
int getLineCount() {

if ( lineCount > -1 ) return lineCount;


lineCount = 0;
lineMetrics.clear();
double totLines = 0.0, prevMinY = 1.0, prevMaxY = -1.0;
int totCharSoFar = 0;
Expand Down
⚡