From 0fdcc83dfd1e279b28fa6a7ca72a4ea3468ba598 Mon Sep 17 00:00:00 2001 From: Alexander Maryanovsky Date: Thu, 11 May 2023 16:08:02 +0300 Subject: [PATCH] Add braces as necessary. --- .../compose/material/DesktopMenu.desktop.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/compose/material/material/src/desktopMain/kotlin/androidx/compose/material/DesktopMenu.desktop.kt b/compose/material/material/src/desktopMain/kotlin/androidx/compose/material/DesktopMenu.desktop.kt index 56635c7e3eb63..58d0d752bc7ed 100644 --- a/compose/material/material/src/desktopMain/kotlin/androidx/compose/material/DesktopMenu.desktop.kt +++ b/compose/material/material/src/desktopMain/kotlin/androidx/compose/material/DesktopMenu.desktop.kt @@ -402,11 +402,10 @@ internal data class DesktopDropdownMenuPositionProvider( else -> this } - fun Int.coerceWithSizeIntoRange(size: Int, min: Int, max: Int) = - if (isLtr) - coerceWithSizeIntoRangePreferMin(size, min, max) - else - coerceWithSizeIntoRangePreferMax(size, min, max) + fun Int.coerceWithSizeIntoRange(size: Int, min: Int, max: Int) = when { + isLtr -> coerceWithSizeIntoRangePreferMin(size, min, max) + else -> coerceWithSizeIntoRangePreferMax(size, min, max) + } // The min margin above and below the menu, relative to the screen. val verticalMargin = with(density) { MenuVerticalMargin.roundToPx() } @@ -415,10 +414,12 @@ internal data class DesktopDropdownMenuPositionProvider( val contentOffsetY = with(density) { contentOffset.y.roundToPx() } // Compute horizontal position. - val preferredX = if (isLtr) + val preferredX = if (isLtr) { anchorBounds.left + contentOffsetX - else + } + else { anchorBounds.right - contentOffsetX - popupContentSize.width + } val x = preferredX.coerceWithSizeIntoRange( size = popupContentSize.width, min = 0,