这是indexloc提供的服务，不要输入任何密码
Skip to content

Set orientation of HandleView in show #1477

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
3 commits merged into from
Jun 9, 2020
Merged

Set orientation of HandleView in show #1477

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a1f57d
Place long press menu above selection
trygveaa Mar 1, 2020
b75e9c8
Flip selection handle at different positions depending on drag direction
trygveaa Mar 1, 2020
caea889
Set orientation of HandleView when showing it
trygveaa Mar 1, 2020
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
37 changes: 17 additions & 20 deletions terminal-view/src/main/java/com/termux/view/TerminalView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,12 +973,12 @@ public boolean isShowing() {
return mContainer.isShowing();
}

private void checkChangedOrientation() {
if (!mIsDragging) {
private void checkChangedOrientation(int posX, boolean force) {
if (!mIsDragging && !force) {
return;
}
long millis = SystemClock.currentThreadTimeMillis();
if (millis - mLastTime < 50) {
if (millis - mLastTime < 50 && !force) {
return;
}
mLastTime = millis;
Expand All @@ -1003,10 +1003,7 @@ private void checkChangedOrientation() {
return;
}

final int[] coords = mTempCoords;
hostView.getLocationInWindow(coords);
final int posX = coords[0] + mPointX;
if (posX < clip.left) {
if (posX - mHandleWidth < clip.left) {
changeOrientation(RIGHT);
} else if (posX + mHandleWidth > clip.right) {
changeOrientation(LEFT);
Expand Down Expand Up @@ -1050,13 +1047,14 @@ private boolean isPositionVisible() {
posY >= clip.top && posY <= clip.bottom;
}

private void moveTo(int x, int y) {
mPointX = x;
private void moveTo(int x, int y, boolean forceOrientationCheck) {
float oldHotspotX = mHotspotX;
checkChangedOrientation(x, forceOrientationCheck);
mPointX = (int) (x - (isShowing() ? oldHotspotX : mHotspotX));
mPointY = y;
checkChangedOrientation();
if (isPositionVisible()) {
int[] coords = null;
if (mContainer.isShowing()) {
if (isShowing()) {
coords = mTempCoords;
TerminalView.this.getLocationInWindow(coords);
int x1 = coords[0] + mPointX;
Expand Down Expand Up @@ -1138,10 +1136,10 @@ public boolean isDragging() {
return mIsDragging;
}

void positionAtCursor(final int cx, final int cy) {
int left = (int) (getPointX(cx) - mHotspotX);
void positionAtCursor(final int cx, final int cy, boolean forceOrientationCheck) {
int left = getPointX(cx);
int bottom = getPointY(cy + 1);
moveTo(left, bottom);
moveTo(left, bottom, forceOrientationCheck);
}
}

Expand All @@ -1162,9 +1160,8 @@ private class SelectionModifierCursorController implements CursorController {

public void show() {
mIsShowing = true;
updatePosition();
mStartHandle.show();
mEndHandle.show();
mStartHandle.positionAtCursor(mSelX1, mSelY1, true);
mEndHandle.positionAtCursor(mSelX2 + 1, mSelY2, true);

final ActionMode.Callback callback = new ActionMode.Callback() {
@Override
Expand Down Expand Up @@ -1240,7 +1237,7 @@ public void onDestroyActionMode(ActionMode mode) {
public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
int x1 = Math.round(mSelX1 * mRenderer.mFontWidth);
int x2 = Math.round(mSelX2 * mRenderer.mFontWidth);
int y1 = Math.round((mSelY1 - mTopRow) * mRenderer.mFontLineSpacing);
int y1 = Math.round((mSelY1 - 1 - mTopRow) * mRenderer.mFontLineSpacing);
int y2 = Math.round((mSelY2 + 1 - mTopRow) * mRenderer.mFontLineSpacing);


Expand Down Expand Up @@ -1395,9 +1392,9 @@ public void updatePosition() {
return;
}

mStartHandle.positionAtCursor(mSelX1, mSelY1);
mStartHandle.positionAtCursor(mSelX1, mSelY1, false);

mEndHandle.positionAtCursor(mSelX2 + 1, mSelY2); //bug
mEndHandle.positionAtCursor(mSelX2 + 1, mSelY2, false);

if (mActionMode != null) {
mActionMode.invalidate();
Expand Down