Prevent edit state workspace scale from hiding next pages.

Fix: 228969651
Test: manual
Change-Id: I0cceb3bfab19e0721b21fb8c55fe1218b1f25af8
This commit is contained in:
Pat Manning
2022-04-14 10:58:16 +01:00
parent 4349d21246
commit ea5c1d29fe
2 changed files with 16 additions and 1 deletions

View File

@@ -53,7 +53,15 @@ public class SpringLoadedState extends LauncherState {
float shrunkTop = grid.getWorkspaceSpringLoadShrunkTop();
float shrunkBottom = grid.getWorkspaceSpringLoadShrunkBottom();
float scale = (shrunkBottom - shrunkTop) / ws.getNormalChildHeight();
float scale = Math.min((shrunkBottom - shrunkTop) / ws.getNormalChildHeight(), 1f);
// Reduce scale if next pages would not be visible after scaling the workspace
float scaledWorkspaceWidth = ws.getWidth() * scale;
float maxAvailableWidth =
ws.getWidth() - (2 * grid.getWorkspaceSpringLoadedMinimumNextPageVisible());
if (scaledWorkspaceWidth > maxAvailableWidth) {
scale *= maxAvailableWidth / scaledWorkspaceWidth;
}
float halfHeight = ws.getHeight() / 2;
float myCenter = ws.getTop() + halfHeight;