From 0b1af34a5f88a9cb3f99d088fe1b7716f4acaf1b Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 30 Oct 2026 17:04:59 -0400 Subject: [PATCH] fix: library filter, sort and display menus aren't cut off in portrait (#1827) * fix: library menus open toward the side with room, so in portrait they are no longer cut off In portrait the Filter, Sort, Display and Collections buttons sit at the left of the screen, but their menus still grew to the left and were squeezed into the space before the button, cutting the labels. A menu now opens the other way when its own side is narrower than the menu and the other side has more room. * fix: step-out menus keep their outline with the content when a resize flips the side * fix: step-out menus still take keyboard focus when the layout shifts while opening --- .../java/com/droiddeck/launcher/ui/StepOut.kt | 45 +++++++++++++------ .../java/com/droiddeck/launcher/ui/Steps.kt | 2 +- .../com/droiddeck/launcher/ui/StoresPage.kt | 2 +- .../com/droiddeck/launcher/ui/StepOutTest.kt | 28 ++++++++++++ 4 files changed, 62 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StepOut.kt b/app/src/main/java/com/droiddeck/launcher/ui/StepOut.kt index 3791fb7820..73e68986de 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StepOut.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StepOut.kt @@ -124,6 +124,18 @@ internal enum class StepSide { Right, } +internal fun fitStepSide(preferred: StepSide, pill: Rect, hostWidth: Float, wanted: Float): StepSide { + val leftRoom = pill.right + val rightRoom = hostWidth - pill.left + val room = if (preferred == StepSide.Left) leftRoom else rightRoom + val other = if (preferred == StepSide.Left) rightRoom else leftRoom + return if (room >= wanted || other <= room) preferred else if (preferred == StepSide.Left) StepSide.Right else StepSide.Left +} + +internal fun stepReach(side: StepSide, pill: Rect, hostWidth: Float, width: Int): Pair = + if (side == StepSide.Left) pill.left to (pill.right - width).coerceAtLeast(0f) + else pill.right to (pill.left + width).coerceAtMost(hostWidth) + internal class StepOutScope(private val items: List>, val first: FocusRequester, val open: Boolean, val maxHeight: Dp) { fun Modifier.stepItem(i: Int): Modifier = graphicsLayer { val v = items[i.coerceIn(0, items.lastIndex)].value @@ -141,7 +153,7 @@ private val OutFillet = 10.dp internal fun StepOut( open: Boolean, pill: Rect, - side: StepSide, + preferredSide: StepSide, accent: Color, onDismiss: () -> Unit, onClosed: () -> Unit, @@ -166,6 +178,7 @@ internal fun StepOut( val opener = remember { arrayOfNulls(1) } val openNow = androidx.compose.runtime.rememberUpdatedState(open) var moving by remember { mutableStateOf(false) } + val placed = remember { arrayOfNulls(3) } if (moving) VeilRing() val pull = with(density) { OutPull.toPx() } val corner = pillCorner?.let { with(density) { it.toPx() } } ?: minOf(pill.height, pill.width) / 2f @@ -177,13 +190,18 @@ internal fun StepOut( maxOf(hostHeight - pill.bottom - pull, pill.top - pull).coerceAtLeast(44.dp.toPx()).toDp() } val up = measured?.let { pill.bottom + pull + it.height > hostHeight && pill.top - pull - it.height >= 0f } ?: false + val wantedW = with(density) { maxWidth.toPx() } + val side = fitStepSide(preferredSide, pill, hostWidth, wantedW) val room = if (side == StepSide.Left) pill.right else hostWidth - pill.left - val maxW = with(density) { maxWidth.toPx() }.coerceAtMost(room).coerceAtLeast(pill.width) - LaunchedEffect(open, measured) { - if (!open && !grown) { onClosed(); return@LaunchedEffect } + val maxW = wantedW.coerceAtMost(room).coerceAtLeast(pill.width) + LaunchedEffect(open, measured, side, pill, hostWidth) { + val moved = placed[0] == open && placed[1] == measured + val flipped = placed[2] != null && placed[2] != side + placed[0] = open; placed[1] = measured; placed[2] = side + if (!open && !grown) { if (!moved) onClosed(); return@LaunchedEffect } val c = measured ?: return@LaunchedEffect - val rest = if (side == StepSide.Left) pill.left else pill.right - val out = if (side == StepSide.Left) (pill.right - c.width).coerceAtLeast(0f) else (pill.left + c.width).coerceAtMost(hostWidth) + val (rest, out) = stepReach(side, pill, hostWidth, c.width) + if (grown && flipped) edge.snapTo(if (open) out else rest) val boxBottom = pill.bottom + pull + c.height if (open) { if (!grown) { @@ -202,11 +220,6 @@ internal fun StepOut( pieces.forEachIndexed { i, a -> launch { delay(Motion.ms(260 + i * 55).toLong()); a.animateTo(1f, Motion.tw(220)) } } - if (inputMode.inputMode == InputMode.Keyboard) launch { - delay(Motion.ms(300).toLong()) - withFrameNanos { } - runCatching { first.requestFocus() } - } } } else { opener[0]?.let { o -> if (inputMode.inputMode == InputMode.Keyboard) runCatching { o.requester.requestFocus() } } @@ -225,6 +238,13 @@ internal fun StepOut( } } + LaunchedEffect(open, measured) { + if (!open || measured == null || inputMode.inputMode != InputMode.Keyboard) return@LaunchedEffect + delay(Motion.ms(300).toLong()) + withFrameNanos { } + runCatching { first.requestFocus() } + } + LaunchedEffect(open, grown, inputMode.inputMode) { if (open && grown && inputMode.inputMode == InputMode.Keyboard) { withFrameNanos { }; runCatching { first.requestFocus() } } } @@ -245,8 +265,7 @@ internal fun StepOut( else stepPathRight(path, pill, edge.value, bottom.value, pill.bottom + pull, boxCorner, fillet, corner) if (up) path.transform(Matrix().apply { this[1, 1] = -1f; this[3, 1] = pill.top + pill.bottom }) val a = measured?.let { c -> - val rest = if (side == StepSide.Left) pill.left else pill.right - val out = if (side == StepSide.Left) (pill.right - c.width).coerceAtLeast(0f) else (pill.left + c.width).coerceAtMost(hostWidth) + val (rest, out) = stepReach(side, pill, hostWidth, c.width) val down = pill.bottom + pull + c.height - pill.bottom val across = kotlin.math.abs(out - rest) val fd = if (down < 1f) 1f else (bottom.value - pill.bottom) / down diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Steps.kt b/app/src/main/java/com/droiddeck/launcher/ui/Steps.kt index 18a4b9703c..9adfb00dbc 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Steps.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Steps.kt @@ -39,7 +39,7 @@ internal fun StepsLayer(origin: Offset) { androidx.activity.compose.BackHandler(enabled = Steps.open) { Steps.fold() } key(ask) { StepOut( - open = Steps.open, pill = ask.anchor.translate(-origin), side = ask.side, accent = ask.accent, + open = Steps.open, pill = ask.anchor.translate(-origin), preferredSide = ask.side, accent = ask.accent, onDismiss = { Steps.fold() }, onClosed = { Steps.closed(ask) }, pillCorner = ask.pillCorner, maxWidth = ask.maxWidth, items = ask.items, handle = ask.handle, content = ask.content, ) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 1b965ee4c3..119c0a4d69 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -395,7 +395,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier StoresMotion.step?.let { ask -> key(ask) { StepOut( - open = StoresMotion.stepOpen, pill = ask.anchor.translate(-hostAt), side = ask.side, accent = ask.accent, + open = StoresMotion.stepOpen, pill = ask.anchor.translate(-hostAt), preferredSide = ask.side, accent = ask.accent, onDismiss = { StoresMotion.fold() }, onClosed = { StoresMotion.closed(ask) }, pillCorner = ask.pillCorner, maxWidth = ask.maxWidth, items = ask.items, handle = ask.handle, content = ask.content, ) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/StepOutTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StepOutTest.kt index 482e584f39..d8f5793973 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/StepOutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/StepOutTest.kt @@ -37,6 +37,34 @@ class StepOutTest { assertEquals(300f, b.bottom, 0.5f) } + @Test fun aLeftMenuWithRoomStaysLeft() { + assertEquals(StepSide.Left, fitStepSide(StepSide.Left, Rect(1900f, 20f, 1980f, 80f), hostWidth = 2400f, wanted = 840f)) + } + + @Test fun aLeftMenuNearTheLeftEdgeOpensRight() { + assertEquals(StepSide.Right, fitStepSide(StepSide.Left, Rect(300f, 20f, 420f, 80f), hostWidth = 1080f, wanted = 840f)) + } + + @Test fun aRightMenuNearTheRightEdgeOpensLeft() { + assertEquals(StepSide.Left, fitStepSide(StepSide.Right, Rect(900f, 20f, 1000f, 80f), hostWidth = 1080f, wanted = 840f)) + } + + @Test fun aSqueezedMenuKeepsItsSideWhenTheOtherSideIsNarrower() { + assertEquals(StepSide.Left, fitStepSide(StepSide.Left, Rect(600f, 20f, 700f, 80f), hostWidth = 1080f, wanted = 840f)) + } + + @Test fun theOutlineReachFollowsTheChosenSide() { + val wide = Rect(600f, 20f, 700f, 80f) + assertEquals(600f to 300f, stepReach(StepSide.Left, wide, hostWidth = 1080f, width = 400)) + assertEquals(700f to 1000f, stepReach(StepSide.Right, wide, hostWidth = 1080f, width = 400)) + } + + @Test fun theOutlineReachStaysInsideTheHost() { + val near = Rect(100f, 20f, 200f, 80f) + assertEquals(100f to 0f, stepReach(StepSide.Left, near, hostWidth = 1080f, width = 400)) + assertEquals(200f to 1080f, stepReach(StepSide.Right, near, hostWidth = 1080f, width = 1200)) + } + @Test fun aClosedOutlineIsJustThePill() { val path = Path() stepPathRight(path, pill, right = pill.right, bottom = pill.bottom, pullTop = pill.bottom + 6f, box = 16f, fillet = 10f, pillCorner = 12f)