Skip to content

Skip failing Mac test; correct Javadoc for some mouse hooks #681

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 2 commits into from
Feb 9, 2018
Merged

Skip failing Mac test; correct Javadoc for some mouse hooks #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ccffad
Skip test on Mac builds (passes on Linux & Windows)
JordanMartinez Feb 9, 2018
38e706a
Correct javadoc on some mouse hooks
JordanMartinez Feb 9, 2018
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
3 changes: 3 additions & 0 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 @@ -135,6 +135,9 @@ public void pressing_mouse_over_text_and_dragging_mouse_selects_text() {

@Test
public void pressing_mouse_over_text_and_dragging_and_releasing_mouse_triggers_new_selection_finished() {
// Doesn't work on Mac builds; works on Linux & Windows
skip_if_on_mac();

SimpleIntegerProperty i = new SimpleIntegerProperty(0);
area.setOnNewSelectionDragFinished(e -> i.set(1));
moveTo(firstLineOfArea())
Expand Down
14 changes: 7 additions & 7 deletions richtextfx/src/main/java/org/fxmisc/richtext/ViewActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ public interface ViewActions<PS, SEG, S> {
EventHandler<MouseEvent> getOnInsideSelectionMousePressReleased();

/**
* Runs the consumer when the mouse is dragged in this scenario: the user has selected some text,
* pressed the mouse on top of the selection, dragged it to a new location within the area,
* but has not yet released the mouse.
* Runs the consumer when the mouse is dragged in this scenario: the user has pressed the mouse over some
* unselected text, and dragged the mouse to a new location within the area, but has not yet released the mouse.
* Each time the user drags the mouse without releasing it, this hook's consumer gets called.
*
* <p>By default, this will create a new selection or
* {@link NavigationActions.SelectionPolicy#ADJUST} the current one to be bigger or
Expand All @@ -127,9 +127,8 @@ public interface ViewActions<PS, SEG, S> {
ObjectProperty<Consumer<Point2D>> onNewSelectionDragProperty();

/**
* Runs the EventHandler when the mouse is released in this scenario: the user has selected some text,
* pressed the mouse on top of the selection, dragged it to a new location within the area,
* and released the mouse.
* Runs the EventHandler when the mouse is released in this scenario: the user has pressed the mouse over some
* unselected text, and dragged the mouse to a new location within the area, and released the mouse.
*
* <p>By default, this will {@link NavigationActions.SelectionPolicy#ADJUST} the
* current selection to be bigger or smaller via the code:
Expand All @@ -147,7 +146,8 @@ public interface ViewActions<PS, SEG, S> {
/**
* Runs the consumer when the mouse is dragged in this scenario: the user has selected some text,
* pressed the mouse on top of the selection, dragged it to a new location within the area,
* but has not yet released the mouse.
* but has not yet released the mouse. Each time the user drags the mouse without releasing it,
* this hook's consumer gets called.
*
* <p>By default, this will {@link GenericStyledArea#displaceCaret(int) displace the caret} to that position
* within the area via the code:
Expand Down
⚡