From b3d7fcbfc198f48ab8f5c159d04e5a7ba43c501e Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Tue, 7 Jun 2011 22:07:46 +0100 Subject: [PATCH] selection UI (in progress) --- src/org/geometerplus/fbreader/fbreader/FBView.java | 13 ++++++++++--- .../geometerplus/zlibrary/text/view/ZLTextView.java | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/org/geometerplus/fbreader/fbreader/FBView.java b/src/org/geometerplus/fbreader/fbreader/FBView.java index 2b1fff620..9ed00b3b6 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBView.java +++ b/src/org/geometerplus/fbreader/fbreader/FBView.java @@ -193,9 +193,16 @@ public final class FBView extends ZLTextView { final ZLTextRegion region = findRegion(x, y, MAX_SELECTION_DISTANCE, ZLTextRegion.AnyRegionFilter); boolean doSelectRegion = false; if (region instanceof ZLTextWordRegion) { - doSelectRegion = - myReader.WordTappingActionOption.getValue() != - FBReaderApp.WordTappingAction.doNothing; + switch (myReader.WordTappingActionOption.getValue()) { + case startSelecting: + // myReader.doAction(ActionCode.SELECTION_HIDE_PANEL); + initSelection(x, y); + return true; + case selectSingleWord: + case openDictionary: + doSelectRegion = true; + break; + } } else if (region instanceof ZLTextImageRegion) { doSelectRegion = myReader.ImageTappingActionOption.getValue() != diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java index 3025cb53c..c1ef50661 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java @@ -1296,7 +1296,7 @@ public abstract class ZLTextView extends ZLTextViewBase { mySelectedRegion = region; } - protected boolean startSelection(int x, int y) { + protected boolean initSelection(int x, int y) { if (!mySelection.start(x, y)) { return false; }