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

Account for insets in layoutChildren() #510

Merged
merged 7 commits into from
Jun 6, 2017
Merged

Account for insets in layoutChildren() #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a6b418d
Account for insets
JordanMartinez May 28, 2017
e38ae64
Add hit tests when padding is applied
JordanMartinez Jun 5, 2017
3bee51a
Add other hit-related tests
JordanMartinez Jun 5, 2017
d090ee7
Fix bug: hits should account for padding
JordanMartinez Jun 5, 2017
8025d07
Only run Mac-failing tests on Linux for now
JordanMartinez Jun 5, 2017
4079472
Fix typo
JordanMartinez Jun 6, 2017
484ca3b
Ignore flaky test
JordanMartinez Jun 6, 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
2 changes: 2 additions & 0 deletions richtextfx/src/integrationTest/java/org/fxmisc/richtext/keyboard/CutCopyPasteTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import javafx.stage.Stage;
import org.fxmisc.richtext.InlineCssTextAreaAppTest;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;

Expand Down Expand Up @@ -241,6 +242,7 @@ private void runAssert() {
assertEquals(beginning + text + end, area.getText());
}

@Ignore("Flaky test when all others of equivalent tests pass")
@Test
public void paste() {
// this test fails on Linux; Windows is untested
Expand Down
164 changes: 164 additions & 0 deletions richtextfx/src/integrationTest/java/org/fxmisc/richtext/view/MiscellaneousAPITests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,22 @@

import com.nitorcreations.junit.runners.NestedRunner;
import javafx.geometry.Bounds;
import javafx.geometry.Insets;
import javafx.geometry.Point2D;
import javafx.geometry.Pos;
import javafx.stage.Stage;
import org.fxmisc.richtext.InlineCssTextAreaAppTest;
import org.fxmisc.richtext.ViewActions.CaretVisibility;
import org.fxmisc.richtext.model.NavigationActions;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.testfx.service.query.PointQuery;
import org.testfx.util.WaitForAsyncUtils;

import java.util.function.Consumer;

import static javafx.scene.input.MouseButton.PRIMARY;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Expand Down Expand Up @@ -111,4 +120,159 @@ public void testMoveCaretWithoutFollowingIt() {
assertFalse(area.getCaretBounds().isPresent());
}
}

public class HitTests extends InlineCssTextAreaAppTest {

private PointQuery position(Pos position, double offsetX, double offsetY) {
return point(area).atPosition(position).atOffset(offsetX, offsetY);
}

private void moveCaretToAreaEnd() {
area.moveTo(area.getLength());
}

public class WhenAreaIsPadded {

double paddingAmount = 20;

public class AndHitsOccurOutsideArea {

String text = "text";
String fullText = text + "\n" + text;

@Before
public void setup() {
interact(() -> area.replaceText(fullText));
}

@Test
public void clickingInTopPaddingMovesCaretToTopLine() {
interact(() -> area.setPadding(new Insets(paddingAmount, 0, 0, 0)));

moveCaretToAreaEnd();
moveTo(position(Pos.TOP_LEFT, 1, 2)).clickOn(PRIMARY);
assertEquals(0, area.getCurrentParagraph());

moveCaretToAreaEnd();
moveTo(position(Pos.TOP_CENTER, 0, 0)).clickOn(PRIMARY);
assertEquals(0, area.getCurrentParagraph());
}

@Test
public void clickingInLeftPaddingMovesCaretToBeginningOfLineOnSingleLineParagraph() {
interact(() -> area.setPadding(new Insets(0, 0, 0, paddingAmount)));

moveCaretToAreaEnd();
moveTo(position(Pos.TOP_LEFT, 1, 1)).clickOn(PRIMARY);
assertEquals(0, area.getCaretColumn());
}

@Test
public void clickingInRightPaddingMovesCaretToEndOfLineOnSingleLineParagraph() {
interact(() -> {
area.setPadding(new Insets(0, paddingAmount, 0, 0));
area.moveTo(0);

// insure we're scrolled all the way to the right
area.scrollBy(new Point2D(100, 0));
});

moveTo(position(Pos.TOP_RIGHT, -1, 1)).clickOn(PRIMARY);
assertEquals(area.getParagraphLenth(0), area.getCaretColumn());
}

@Test
public void clickingInBottomPaddingMovesCaretToBottomLine() {
interact(() -> {
area.setPadding(new Insets(0, 0, paddingAmount, 0));
area.moveTo(0);

// insure we're scrolled all the way to the bottom
area.scrollBy(new Point2D(0, 100));
});

moveTo(position(Pos.BOTTOM_CENTER, 0, -2)).clickOn(PRIMARY);
assertEquals(1, area.getCurrentParagraph());
}

}

public class AndHitsOccurInsideArea {

String text = "abcdefghijklmnopqrstuvwxyz";
String fullText;

{
int totalPars = 50;
int indexLimit = totalPars - 1;
StringBuilder sb = new StringBuilder();
Consumer<Integer> appendParagraph = i -> sb.append("Par #").append(i).append(" ").append(text);
for (int i = 0; i < indexLimit; i++) {
appendParagraph.accept(i);
sb.append("\n");
}
appendParagraph.accept(indexLimit);
fullText = sb.toString();
}

@Before
public void setup() {
interact(() -> {
area.replaceText(fullText);
area.setPadding(new Insets(paddingAmount));
area.setStyle("-fx-font-family: monospace; -fx-font-size: 12pt;");
});
}

@Test
public void clickingCharacterShouldMoveCaretToThatPosition() {
int start = area.getAbsolutePosition(3, 8);
Bounds b = area.getCharacterBoundsOnScreen(start, start + 1).get();
moveTo(b).clickOn(PRIMARY);
assertEquals(start, area.getCaretPosition());
}

@Test
public void prevPageMovesCaretToTopOfPage() {
// Mac: failed; Windows: untested
// TODO: test on respective OS and update expected values to be correct
run_only_on_linux();

area.showParagraphAtBottom(area.getParagraphs().size() - 1);
// move to last line, column 0
area.moveTo(area.getParagraphs().size() - 1, 0);

interact(() -> {
// hit is called here
area.prevPage(NavigationActions.SelectionPolicy.CLEAR);
});

assertEquals(0, area.getCaretColumn());
assertEquals(32, area.getCurrentParagraph());
}

@Test
public void nextPageMovesCaretToBottomOfPage() {
// Mac: failed; Windows: untested
// TODO: test on respective OS and update expected values to be correct
run_only_on_linux();

area.showParagraphAtTop(0);
area.moveTo(0);

interact(() -> {
// hit is called here
area.nextPage(NavigationActions.SelectionPolicy.CLEAR);
});

assertEquals(0, area.getCaretColumn());
assertEquals(17, area.getCurrentParagraph());
}

}

}

}

}
12 changes: 10 additions & 2 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 @@ -922,6 +922,7 @@ CharacterHit hit(ParagraphBox.CaretOffsetX x, TwoDimensional.Position targetLine
}

CharacterHit hit(ParagraphBox.CaretOffsetX x, double y) {
// don't account for padding here since height of virtualFlow is used, not area + potential padding
VirtualFlowHit<Cell<Paragraph<PS, SEG, S>, ParagraphBox<PS, SEG, S>>> hit = virtualFlow.hit(0.0, y);
if(hit.isBeforeCells()) {
return CharacterHit.insertionAt(0);
Expand All @@ -939,7 +940,10 @@ CharacterHit hit(ParagraphBox.CaretOffsetX x, double y) {

@Override
public CharacterHit hit(double x, double y) {
VirtualFlowHit<Cell<Paragraph<PS, SEG, S>, ParagraphBox<PS, SEG, S>>> hit = virtualFlow.hit(x, y);
// mouse position used, so account for padding
double adjustedX = x - getInsets().getLeft();
double adjustedY = y - getInsets().getTop();
VirtualFlowHit<Cell<Paragraph<PS, SEG, S>, ParagraphBox<PS, SEG, S>>> hit = virtualFlow.hit(adjustedX, adjustedY);
if(hit.isBeforeCells()) {
return CharacterHit.insertionAt(0);
} else if(hit.isAfterCells()) {
Expand Down Expand Up @@ -1356,7 +1360,11 @@ public void dispose() {

@Override
protected void layoutChildren() {
virtualFlow.resize(getWidth(), getHeight());
Insets ins = getInsets();
virtualFlow.resizeRelocate(
ins.getLeft(), ins.getTop(),
getWidth() - ins.getLeft() - ins.getRight(),
getHeight() - ins.getTop() - ins.getBottom());
if(followCaretRequested) {
followCaretRequested = false;
try (Guard g = viewportDirty.suspend()) {
Expand Down