aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 09:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use taskbarSize to calculate clippedInsets

Browse Source 
- Instead of calculating clippedInsets from thumbnail dimension, always use taskbarSize
- Clean up clippedInsets code as only bottom inset is ever present

Fix: 235328056
Test: With taskbar hidden, out of orientation thumbnail has proper size in quickswitch and overview
Change-Id: I3d7fc7899f04862c3401935b10f475e9ab74685a
This commit is contained in:
Alex Chau
2022-07-04 17:51:22 +01:00
parent e19aab9010
commit b00a9fca79
2 changed files with 10 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
View File

@@ -560,33 +560,16 @@ public class TaskThumbnailView extends View {
thumbnailScale = targetW / (croppedWidth * scale);
}
Rect splitScreenInsets = dp.getInsets();
if (!isRotated) {
// No Rotation
mClippedInsets.offsetTo(thumbnailClipHint.left * scale,
thumbnailClipHint.top * scale);
mMatrix.setTranslate(
-thumbnailClipHint.left * scale,
-thumbnailClipHint.top * scale);
} else {
setThumbnailRotation(deltaRotate, thumbnailClipHint, scale, thumbnailBounds, dp);
setThumbnailRotation(deltaRotate, thumbnailBounds);
}
final float widthWithInsets;
final float heightWithInsets;
if (isOrientationDifferent) {
widthWithInsets = thumbnailBounds.height() * thumbnailScale;
heightWithInsets = thumbnailBounds.width() * thumbnailScale;
} else {
widthWithInsets = thumbnailBounds.width() * thumbnailScale;
heightWithInsets = thumbnailBounds.height() * thumbnailScale;
}
mClippedInsets.left *= thumbnailScale;
mClippedInsets.top *= thumbnailScale;
mClippedInsets.right = Math.max(0,
widthWithInsets - mClippedInsets.left - canvasWidth);
mClippedInsets.bottom = Math.max(0,
heightWithInsets - mClippedInsets.top - canvasHeight);
float canvasScreenRatio = canvasWidth / (float) dp.widthPx;
mClippedInsets.set(0, 0, 0, dp.taskbarSize * canvasScreenRatio);
mMatrix.postScale(thumbnailScale, thumbnailScale);
mIsOrientationChanged = isOrientationDifferent;
@@ -607,44 +590,32 @@ public class TaskThumbnailView extends View {
return deltaRotation == Surface.ROTATION_90 || deltaRotation == Surface.ROTATION_270;
}
private void setThumbnailRotation(int deltaRotate, RectF thumbnailInsets, float scale,
Rect thumbnailPosition, DeviceProfile dp) {
float newLeftInset = 0;
float newTopInset = 0;
private void setThumbnailRotation(int deltaRotate, Rect thumbnailPosition) {
float translateX = 0;
float translateY = 0;
mMatrix.setRotate(90 * deltaRotate);
switch (deltaRotate) { /* Counter-clockwise */
case Surface.ROTATION_90:
newLeftInset = thumbnailInsets.bottom;
newTopInset = thumbnailInsets.left;
translateX = thumbnailPosition.height();
break;
case Surface.ROTATION_270:
newLeftInset = thumbnailInsets.top;
newTopInset = thumbnailInsets.right;
translateY = thumbnailPosition.width();
break;
case Surface.ROTATION_180:
newLeftInset = -thumbnailInsets.top;
newTopInset = -thumbnailInsets.left;
translateX = thumbnailPosition.width();
translateY = thumbnailPosition.height();
break;
}
mClippedInsets.offsetTo(newLeftInset * scale, newTopInset * scale);
mMatrix.postTranslate(translateX, translateY);
if (TaskView.useFullThumbnail(dp)) {
mMatrix.postTranslate(-mClippedInsets.left, -mClippedInsets.top);
}
}
/**
* Insets to used for clipping the thumbnail (in case it is drawing outside its own space)
*/
public RectF getInsetsToDrawInFullscreen(DeviceProfile dp) {
return TaskView.useFullThumbnail(dp) ? mClippedInsets : EMPTY_RECT_F;
return dp.isTaskbarPresent && !dp.isTaskbarPresentInApps
? mClippedInsets : EMPTY_RECT_F;
}
}
}

17
quickstep/src/com/android/quickstep/views/TaskView.java
View File

@@ -164,13 +164,6 @@ public class TaskView extends FrameLayout implements Reusable {
return deviceProfile.isTablet;
}
/**
* Should the TaskView scale down to fit whole thumbnail in fullscreen.
*/
public static boolean useFullThumbnail(DeviceProfile deviceProfile) {
return deviceProfile.isTablet && !deviceProfile.isTaskbarPresentInApps;
}
private static final float EDGE_SCALE_DOWN_FACTOR_CAROUSEL = 0.03f;
private static final float EDGE_SCALE_DOWN_FACTOR_GRID = 0.00f;
@@ -1576,13 +1569,11 @@ public class TaskView extends FrameLayout implements Reusable {
RectF insets = pph.getInsetsToDrawInFullscreen(dp);
float currentInsetsLeft = insets.left * fullscreenProgress;
float currentInsetsTop = insets.top * fullscreenProgress;
float currentInsetsRight = insets.right * fullscreenProgress;
float insetsBottom = insets.bottom;
if (dp.isTaskbarPresentInApps) {
insetsBottom = Math.max(0, insetsBottom - dp.taskbarSize);
}
mCurrentDrawnInsets.set(currentInsetsLeft, insets.top * fullscreenProgress,
currentInsetsRight, insetsBottom * fullscreenProgress);
float currentInsetsBottom = insets.bottom * fullscreenProgress;
mCurrentDrawnInsets.set(
currentInsetsLeft, currentInsetsTop, currentInsetsRight, currentInsetsBottom);
mCurrentDrawnCornerRadius =
Utilities.mapRange(fullscreenProgress, mCornerRadius, mWindowCornerRadius)