Skip to content

Upgrade Flowless to 0.6-SNAPSHOT #515

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 1 commit into from
Jun 2, 2017
Merged

Upgrade Flowless to 0.6-SNAPSHOT #515

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
2 changes: 1 addition & 1 deletion richtextfx/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ integrationTest.mustRunAfter test
dependencies {
compile group: 'org.reactfx', name: 'reactfx', version: '2.0-M5'
compile (group: 'org.fxmisc.undo', name: 'undofx', version: '1.3.1')
compile (group: 'org.fxmisc.flowless', name: 'flowless', version: '0.5.2')
compile (group: 'org.fxmisc.flowless', name: 'flowless', version: '0.6-SNAPSHOT')
compile group: 'org.fxmisc.wellbehaved', name: 'wellbehavedfx', version: '0.3'

testCompile group: 'junit', name: 'junit', version: '[4.0,5)'
Expand Down
23 changes: 21 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 @@ -1151,10 +1151,29 @@ public Position offsetToPosition(int charOffset, Bias bias) {
* *
* ********************************************************************** */

@Override
public void scrollXToPixel(double pixel) {
virtualFlow.scrollXToPixel(pixel);
}

@Override
public void scrollYToPixel(double pixel) {
virtualFlow.scrollYToPixel(pixel);
}

@Override
public void scrollXBy(double deltaX) {
virtualFlow.scrollXBy(deltaX);
}

@Override
public void scrollYBy(double deltaY) {
virtualFlow.scrollYBy(deltaY);
}

@Override
public void scrollBy(Point2D deltas) {
virtualFlow.scrollXBy(deltas.getX());
virtualFlow.scrollYBy(deltas.getY());
virtualFlow.scrollBy(deltas);
}

void show(double y) {
Expand Down
7 changes: 0 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 @@ -309,13 +309,6 @@ public static enum CaretVisibility {
* *
* ********************************************************************** */

/**
* Scroll area horizontally by {@code deltas.getX()} and vertically by {@code deltas.getY()}
*
* @param deltas negative values scroll left/up, positive scroll right/down
*/
void scrollBy(Point2D deltas);

/**
* Shows the paragraph somewhere in the viewport. If the line is already visible, no noticeable change occurs.
* If line is above the current view, it appears at the top of the viewport. If the line is below the current
Expand Down
⚡