Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Makes sure the magnifier source bounds doesn't beyond the surface." into rvc-dev

Browse Source
This commit is contained in:
Shu Chen
2020-02-27 11:47:13 +00:00
committed by Android (Google) Code Review
parent e0ffd803d5 d06b330767
commit 2c591e8c6b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/widget/Magnifier.java
View File

@@ -353,8 +353,9 @@ public final class Magnifier {
// Gets the startX for new style, which should be bounded by the horizontal bounds. // Gets the startX for new style, which should be bounded by the horizontal bounds.
// Also calculates the left/right cut width for pixel copy. // Also calculates the left/right cut width for pixel copy.
leftBound += mViewCoordinatesInSurface[0]; leftBound = Math.max(leftBound + mViewCoordinatesInSurface[0], 0);
rightBound += mViewCoordinatesInSurface[0]; rightBound = Math.min(
rightBound + mViewCoordinatesInSurface[0], mContentCopySurface.mWidth);
mLeftCutWidth = Math.max(0, leftBound - startX); mLeftCutWidth = Math.max(0, leftBound - startX);
mRightCutWidth = Math.max(0, startX + mSourceWidth - rightBound); mRightCutWidth = Math.max(0, startX + mSourceWidth - rightBound);
startX = Math.max(startX, leftBound); startX = Math.max(startX, leftBound);