diff options
| author | Tom Schindl | 2016-04-22 18:40:14 +0000 |
|---|---|---|
| committer | Tom Schindl | 2016-04-22 18:41:00 +0000 |
| commit | 3af72a0113afe2655903365ec87d6e0a4cba0089 (patch) | |
| tree | 6696182228ef70f17cab392ec0490c87fd55db38 | |
| parent | df10e163d3f8a959ba5697f31d0bf2a4d7838539 (diff) | |
| download | org.eclipse.efxclipse-3af72a0113afe2655903365ec87d6e0a4cba0089.tar.gz org.eclipse.efxclipse-3af72a0113afe2655903365ec87d6e0a4cba0089.tar.xz org.eclipse.efxclipse-3af72a0113afe2655903365ec87d6e0a4cba0089.zip | |
Bug 492271 - Dragging Selector on line-ruler selects text to position 0
2 files changed, 7 insertions, 2 deletions
diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/StyledTextBehavior.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/StyledTextBehavior.java index e54ce628c..e110084bc 100644 --- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/StyledTextBehavior.java +++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/behavior/StyledTextBehavior.java @@ -319,7 +319,9 @@ public class StyledTextBehavior { private void onTextPositionDragged(TextPositionEvent event) { if (this.dragSelectionMode) { - moveCaretAbsolute(event.getOffset(), true); + if( event.getOffset() >= 0 ) { + moveCaretAbsolute(event.getOffset(), true); + } event.consume(); } else if (this.dragMoveTextMode) { // update insertion marker diff --git a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/ContentView.java b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/ContentView.java index a5777f43a..922fd8004 100644 --- a/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/ContentView.java +++ b/bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/internal/ContentView.java @@ -160,8 +160,10 @@ public class ContentView extends Pane { if (i >= 0 ) {
return Integer.valueOf(n.getStartOffset() + i);
}
- else {
+ else if( point.getX() > 0 ) {
return Integer.valueOf(n.getEndOffset());
+ } else {
+ return Integer.valueOf(-1);
}
});
return index;
@@ -851,6 +853,7 @@ public class ContentView extends Pane { public Optional<Integer> getLineIndex(Point2D point) {
// transform point to respect horizontal scrolling
Point2D p = this.lineLayer.sceneToLocal(this.localToScene(point));
+ System.err.println(p);
Optional<Integer> result = this.lineLayer.getLineIndex(p);
return result;
|