Skip to content

select moved text after drag-and-drop #576

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 3 commits into from
Sep 12, 2017
Merged

select moved text after drag-and-drop #576

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
bc44cd2
select moved text after drag-and-drop
DevCharly Sep 7, 2017
51b2edf
attempt to fix unit test for previous commit (select moved text after…
DevCharly Sep 7, 2017
76788db
2nd attempt to fix unit test for previous commit (select moved text a…
DevCharly Sep 12, 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
22 changes: 13 additions & 9 deletions richtextfx/src/integrationTest/java/org/fxmisc/richtext/mouse/ClickAndDragTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ public class AndTextIsSelected extends InlineCssTextAreaAppTest {

private String firstWord = "Some";
private String firstParagraph = firstWord + " text goes here";
private String extraText = "This is extra text";

@Test
public void singleClickingWithinSelectedTextMovesCaretToThatPosition() {
Expand Down Expand Up @@ -238,37 +239,40 @@ public void pressingMouseOnUnselectedTextAndDraggingMakesNewSelection() {
public void pressingMouseOnSelectionAndDraggingDisplacesCaret() {
// setup
interact(() -> {
area.replaceText(firstParagraph + "\n" + "This is extra text");
area.replaceText(firstParagraph + "\n" + extraText);
area.selectRange(0, firstWord.length());
});

String selText = area.getSelectedText();
int caretPos = area.getCaretPosition();

moveTo(firstLineOfArea())
.press(PRIMARY)
.moveBy(0, 14);
.moveBy(0, 22);

assertTrue(caretPos != area.getCaretPosition());
assertEquals(firstParagraph.length() + 1, area.getCaretPosition());
assertEquals(selText, area.getSelectedText());
}

@Test
public void pressingMouseOnSelectionAndDraggingAndReleasingMovesSelectedTextToThatPosition() {
// setup
interact(() -> {
area.replaceText(firstParagraph + "\n" + "This is extra text");
area.replaceText(firstParagraph + "\n" + extraText);
area.selectRange(0, firstWord.length());
});

int caretPos = area.getCaretPosition();
String selText = area.getSelectedText();

moveTo(firstLineOfArea())
.press(PRIMARY)
.dropBy(0, 14);
.dropBy(0, 22);

assertTrue(caretPos != area.getCaretPosition());
assertTrue(area.getSelectedText().isEmpty());
String expectedText = firstParagraph.substring(firstWord.length())
+ "\n" + firstWord + extraText;

assertEquals(firstParagraph.length() + 1, area.getCaretPosition());
assertEquals(selText, area.getSelectedText());
assertEquals(expectedText, area.getText());
}

}
Expand Down
3 changes: 3 additions & 0 deletions richtextfx/src/main/java/org/fxmisc/richtext/model/EditActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@ default void moveSelectedText(int pos) {
pos -= sel.getLength();
deleteText(sel);
insert(pos, text);

// select moved text
selectRange(pos, pos + text.length());
}
}
}
⚡