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

fix: Top value of text action bar content rect #2801

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

Closed
wants to merge 3 commits into from
Closed

fix: Top value of text action bar content rect #2801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55bdafd
Update TerminalRenderer.java
dev-bz May 27, 2022
303feb9
Update TextSelectionCursorController.java
dev-bz May 27, 2022
443062e
Merge branch 'termux:master' into patch-1
dev-bz Sep 3, 2022
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
4 changes: 4 additions & 0 deletions terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,4 +246,8 @@ public float getFontWidth() {
public int getFontLineSpacing() {
return mFontLineSpacing;
}

public int getFontLineSpacingAndAscent() {
return mFontLineSpacingAndAscent;
}
}
4 changes: 2 additions & 2 deletions terminal-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public void onDestroyActionMode(ActionMode mode) {
public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
int x1 = Math.round(mSelX1 * terminalView.mRenderer.getFontWidth());
int x2 = Math.round(mSelX2 * terminalView.mRenderer.getFontWidth());
int y1 = Math.round((mSelY1 - 1 - terminalView.getTopRow()) * terminalView.mRenderer.getFontLineSpacing());
int y1 = Math.round((mSelY1 - terminalView.getTopRow()) * terminalView.mRenderer.getFontLineSpacing());
int y2 = Math.round((mSelY2 + 1 - terminalView.getTopRow()) * terminalView.mRenderer.getFontLineSpacing());

if (x1 > x2) {
Expand All @@ -195,7 +195,7 @@ public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
}

int terminalBottom = terminalView.getBottom();
int top = y1 + mHandleHeight;
int top = y1 + terminalView.mRenderer.getFontLineSpacingAndAscent();
int bottom = y2 + mHandleHeight;
if (top > terminalBottom) top = terminalBottom;
if (bottom > terminalBottom) bottom = terminalBottom;
Expand Down