Add the rest of per-layout logic for keytip anchoring

For #56
kirill-grouchnikov · Sep 12, 2023 · 3fcc63c · 3fcc63c
1 parent 36de6ae
commit 3fcc63c
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 16 deletions.
diff --git a/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/AuroraCommandButton.kt b/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/AuroraCommandButton.kt
@@ -879,8 +879,8 @@ internal fun <M : BaseCommandMenuContentModel,
     val compositionLocalContext by rememberUpdatedState(currentCompositionLocalContext)
     val coroutineScope = rememberCoroutineScope()
 
-    val trackBounds = LocalRibbonTrackBounds.current
-    val trackKeyTips = LocalRibbonTrackKeyTips.current
+    val trackBounds = LocalRibbonTrackBounds.current && (popupMenu == null)
+    val trackKeyTips = LocalRibbonTrackKeyTips.current && (popupMenu == null)
 
     Layout(
         modifier = modifier.commandButtonLocator(

diff --git a/...esktopMain/kotlin/org/pushingpixels/aurora/component/layout/CommandButtonLayoutManager.kt b/...esktopMain/kotlin/org/pushingpixels/aurora/component/layout/CommandButtonLayoutManager.kt
@@ -188,27 +188,17 @@ interface CommandButtonLayoutManager : MeasureScope {
         preLayoutInfo: CommandButtonPreLayoutInfo
     ): CommandButtonLayoutInfo
 
-    open fun getActionKeyTipAnchorCenterPoint(
+    fun getActionKeyTipAnchorCenterPoint(
         command: BaseCommand,
         presentationModel: BaseCommandButtonPresentationModel,
         layoutInfo: CommandButtonLayoutInfo
-    ): Offset {
-        return Offset(
-            (layoutInfo.actionClickArea.left + layoutInfo.actionClickArea.right) / 2.0f,
-            (layoutInfo.actionClickArea.top + layoutInfo.actionClickArea.bottom) / 2.0f,
-        )
-    }
+    ): Offset
 
-    open fun getPopupKeyTipAnchorCenterPoint(
+    fun getPopupKeyTipAnchorCenterPoint(
         command: BaseCommand,
         presentationModel: BaseCommandButtonPresentationModel,
         layoutInfo: CommandButtonLayoutInfo
-    ): Offset {
-        return Offset(
-            (layoutInfo.popupClickArea.left + layoutInfo.popupClickArea.right) / 2.0f,
-            (layoutInfo.popupClickArea.top + layoutInfo.popupClickArea.bottom) / 2.0f,
-        )
-    }
+    ): Offset
 }
 
 fun getCommandButtonKind(

diff --git a/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/ribbon/RibbonBand.kt b/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/ribbon/RibbonBand.kt
@@ -15,6 +15,7 @@
  */
 package org.pushingpixels.aurora.component.ribbon
 
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.painter.Painter
@@ -296,6 +297,30 @@ object RibbonBandCommandButtonPresentationStates {
                 popupActionRect = popupActionRect
             )
         }
+
+        override fun getActionKeyTipAnchorCenterPoint(
+            command: BaseCommand,
+            presentationModel: BaseCommandButtonPresentationModel,
+            layoutInfo: CommandButtonLayoutManager.CommandButtonLayoutInfo
+        ): Offset {
+            // horizontally centered at the bottom edge of the action click area
+            return Offset(
+                x = layoutInfo.actionClickArea.left + layoutInfo.actionClickArea.width / 2,
+                y = layoutInfo.actionClickArea.top + layoutInfo.actionClickArea.height
+            )
+        }
+
+        override fun getPopupKeyTipAnchorCenterPoint(
+            command: BaseCommand,
+            presentationModel: BaseCommandButtonPresentationModel,
+            layoutInfo: CommandButtonLayoutManager.CommandButtonLayoutInfo
+        ): Offset {
+            // horizontally centered at the bottom edge of the popup click area
+            return Offset(
+                x = layoutInfo.popupClickArea.left + layoutInfo.popupClickArea.width / 2,
+                y = layoutInfo.popupClickArea.top + layoutInfo.popupClickArea.height
+            )
+        }
     }
 
     val BigFixed: CommandButtonPresentationState =

diff --git a/...g/pushingpixels/aurora/component/utils/appmenu/CommandButtonLayoutManagerAppMenuLevel2.kt b/...g/pushingpixels/aurora/component/utils/appmenu/CommandButtonLayoutManagerAppMenuLevel2.kt
@@ -15,6 +15,7 @@
  */
 package org.pushingpixels.aurora.component.utils.appmenu
 
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.text.Paragraph
@@ -737,4 +738,44 @@ internal class CommandButtonLayoutManagerAppMenuLevel2(
             popupActionRect = popupActionRect
         )
     }
+
+    override fun getActionKeyTipAnchorCenterPoint(
+        command: BaseCommand,
+        presentationModel: BaseCommandButtonPresentationModel,
+        layoutInfo: CommandButtonLayoutManager.CommandButtonLayoutInfo
+    ): Offset {
+        return if (layoutDirection == LayoutDirection.Ltr) {
+            // bottom-right corner of the icon area
+            Offset(
+                x = layoutInfo.iconRect.left + layoutInfo.iconRect.width,
+                y = layoutInfo.actionClickArea.top + layoutInfo.actionClickArea.height
+            )
+        } else {
+            // bottom-left corner of the icon area
+            Offset(
+                x = layoutInfo.iconRect.left,
+                y = layoutInfo.actionClickArea.top + layoutInfo.actionClickArea.height
+            )
+        }
+    }
+
+    override fun getPopupKeyTipAnchorCenterPoint(
+        command: BaseCommand,
+        presentationModel: BaseCommandButtonPresentationModel,
+        layoutInfo: CommandButtonLayoutManager.CommandButtonLayoutInfo
+    ): Offset {
+        return if (layoutDirection == LayoutDirection.Ltr) {
+            // bottom-left corner of the popup click area
+            Offset(
+                x = layoutInfo.popupClickArea.left,
+                y = layoutInfo.popupClickArea.top + layoutInfo.popupClickArea.height
+            )
+        } else {
+            // bottom-left corner of the popup click area
+            Offset(
+                x = layoutInfo.popupClickArea.left + layoutInfo.popupClickArea.width,
+                y = layoutInfo.popupClickArea.top + layoutInfo.popupClickArea.height
+            )
+        }
+    }
 }
diff --git a/window/src/desktopMain/kotlin/org/pushingpixels/aurora/window/AuroraWindowMenuBar.kt b/window/src/desktopMain/kotlin/org/pushingpixels/aurora/window/AuroraWindowMenuBar.kt
@@ -21,6 +21,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.text.Paragraph
@@ -150,6 +151,30 @@ private object WindowMenuBarLayout {
                 popupActionRect = Rect.Zero
             )
         }
+
+        override fun getActionKeyTipAnchorCenterPoint(
+            command: BaseCommand,
+            presentationModel: BaseCommandButtonPresentationModel,
+            layoutInfo: CommandButtonLayoutManager.CommandButtonLayoutInfo
+        ): Offset {
+            // horizontally centered at the bottom edge of the action click area
+            return Offset(
+                x = layoutInfo.actionClickArea.left + layoutInfo.actionClickArea.width / 2,
+                y = layoutInfo.actionClickArea.top + layoutInfo.actionClickArea.height
+            )
+        }
+
+        override fun getPopupKeyTipAnchorCenterPoint(
+            command: BaseCommand,
+            presentationModel: BaseCommandButtonPresentationModel,
+            layoutInfo: CommandButtonLayoutManager.CommandButtonLayoutInfo
+        ): Offset {
+            // horizontally centered at the bottom edge of the popup click area
+            return Offset(
+                x = layoutInfo.popupClickArea.left + layoutInfo.popupClickArea.width / 2,
+                y = layoutInfo.popupClickArea.top + layoutInfo.popupClickArea.height
+            )
+        }
     }
 
     val MenuBar: CommandButtonPresentationState =