fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-07 03:05:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix gesture handling while selecting text

Browse Source 
Also remove stray debug logging.
This commit is contained in:
Fredrik Fornwall
2016-01-13 10:52:23 +01:00
parent fa9ea2db5c
commit 50337cbf9d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/termux/view/TerminalView.java
View File

@@ -117,7 +117,6 @@ public final class TerminalView extends View {
@Override @Override
public boolean onScroll(MotionEvent e2, float distanceX, float distanceY) { public boolean onScroll(MotionEvent e2, float distanceX, float distanceY) {
Log.e("termux", "onScroll=" + e2 + ", mIsselection=" + mIsSelectingText + ", mouse=" + e2.isFromSource(InputDevice.SOURCE_MOUSE));
if (mEmulator == null || mIsSelectingText) return true; if (mEmulator == null || mIsSelectingText) return true;
if (mEmulator.isMouseTrackingActive() && e2.isFromSource(InputDevice.SOURCE_MOUSE)) { if (mEmulator.isMouseTrackingActive() && e2.isFromSource(InputDevice.SOURCE_MOUSE)) {
// If moving with mouse pointer while pressing button, report that instead of scroll. // If moving with mouse pointer while pressing button, report that instead of scroll.
@@ -136,6 +135,7 @@ public final class TerminalView extends View {
@Override @Override
public boolean onScale(float focusX, float focusY, float scale) { public boolean onScale(float focusX, float focusY, float scale) {
if (mEmulator == null || mIsSelectingText) return true;
mScaleFactor *= scale; mScaleFactor *= scale;
mScaleFactor = mOnKeyListener.onScale(mScaleFactor); mScaleFactor = mOnKeyListener.onScale(mScaleFactor);
return true; return true;
@@ -502,8 +502,7 @@ public final class TerminalView extends View {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) mActionMode.invalidateContentRect(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) mActionMode.invalidateContentRect();
invalidate(); invalidate();
// Return to prevent gestures when moving while selecting text. break;
return true;
default: default:
break; break;
} }