Skip to content

Remove unused method/import; use caret's target caret offset, not area's #539

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
JordanMartinez merged 5 commits into from
Jul 8, 2017
Merged

Remove unused method/import; use caret's target caret offset, not area's #539

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6bc78a
Remove unneeded imports
JordanMartinez Jul 8, 2017
f65560e
Remove area's target caret offset; use main caret's instead
JordanMartinez Jul 8, 2017
3afca96
Remove unused method: getCaretBoundsInViewport
JordanMartinez Jul 8, 2017
e357fdc
Remove unused method: show(double y)
JordanMartinez Jul 8, 2017
9a75fee
Remove unused method: getCaretBoundsOnScreen()
JordanMartinez Jul 8, 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
28 changes: 1 addition & 27 deletions richtextfx/src/main/java/org/fxmisc/richtext/GenericStyledArea.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
import java.util.function.IntFunction;
import java.util.function.IntSupplier;
import java.util.function.IntUnaryOperator;
import java.util.function.UnaryOperator;
import java.util.stream.Collectors;

import javafx.beans.NamedArg;
import javafx.beans.binding.Binding;
Expand Down Expand Up @@ -500,9 +498,6 @@ public Optional<Tuple2<Codec<PS>, Codec<SEG>>> getStyleCodecs() {

private Subscription subscriptions = () -> {};

// Remembers horizontal position when traversing up / down.
private Optional<ParagraphBox.CaretOffsetX> targetCaretOffset = Optional.empty();

private final VirtualFlow<Paragraph<PS, SEG, S>, Cell<Paragraph<PS, SEG, S>, ParagraphBox<PS, SEG, S>>> virtualFlow;

// used for two-level navigation, where on the higher level are
Expand Down Expand Up @@ -707,18 +702,6 @@ public GenericStyledArea(
* *
* ********************************************************************** */

/**
* Returns caret bounds relative to the viewport, i.e. the visual bounds
* of the embedded VirtualFlow.
*/
Optional<Bounds> getCaretBoundsInViewport() {
return virtualFlow.getCellIfVisible(getCurrentParagraph())
.map(c -> {
Bounds cellBounds = c.getNode().getCaretBounds();
return virtualFlow.cellToViewport(c, cellBounds);
});
}

/**
* Returns x coordinate of the caret in the current paragraph.
*/
Expand Down Expand Up @@ -1010,10 +993,6 @@ public void scrollBy(Point2D deltas) {
suspendVisibleParsWhile(() -> virtualFlow.scrollBy(deltas));
}

void show(double y) {
suspendVisibleParsWhile(() -> virtualFlow.show(y));
}

@Override
public void showParagraphInViewport(int paragraphIndex) {
suspendVisibleParsWhile(() -> virtualFlow.show(paragraphIndex));
Expand Down Expand Up @@ -1288,11 +1267,6 @@ private Optional<Bounds> getRangeBoundsOnScreen(int paragraphIndex, int from, in
.map(c -> c.getNode().getRangeBoundsOnScreen(from, to));
}

private Optional<Bounds> getCaretBoundsOnScreen() {
return virtualFlow.getCellIfVisible(getCurrentParagraph())
.map(c -> c.getNode().getCaretBoundsOnScreen());
}

public final Optional<Bounds> getCaretBoundsOnScreen(int paragraphIndex) {
return virtualFlow.getCellIfVisible(paragraphIndex)
.map(c -> c.getNode().getCaretBoundsOnScreen());
Expand Down Expand Up @@ -1366,7 +1340,7 @@ private void suspendVisibleParsWhile(Runnable runnable) {
}

void clearTargetCaretOffset() {
targetCaretOffset = Optional.empty();
mainCaret.clearTargetOffset();
}

ParagraphBox.CaretOffsetX getTargetCaretOffset() {
Expand Down
⚡