Position PopupContainerUi relative to PopupComponent root view

rocka · rocka · commit 42e800f2362a · 2024-10-23T00:04:05.000+08:00
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/input/popup/PopupComponent.kt b/app/src/main/java/org/fcitx/fcitx5/android/input/popup/PopupComponent.kt
@@ -131,13 +131,7 @@ class PopupComponent :
             keys,
             labels
         )
-        root.apply {
-            add(keyboardUi.root, lParams {
-                leftMargin = bounds.left + keyboardUi.offsetX
-                topMargin = bounds.top + keyboardUi.offsetY
-            })
-        }
-        showingContainerUi[viewId] = keyboardUi
+        showPopupContainer(viewId, keyboardUi)
     }
 
     private fun showMenu(viewId: Int, menu: KeyDef.Popup.Menu, bounds: Rect) {
@@ -152,13 +146,17 @@ class PopupComponent :
             { dismissPopup(viewId) },
             menu.items,
         )
+        showPopupContainer(viewId, menuUi)
+    }
+
+    private fun showPopupContainer(viewId: Int, ui: PopupContainerUi) {
         root.apply {
-            add(menuUi.root, lParams {
-                leftMargin = bounds.left + menuUi.offsetX
-                topMargin = bounds.top + menuUi.offsetY
+            add(ui.root, lParams {
+                leftMargin = ui.triggerBounds.left + ui.offsetX - rootBounds.left
+                topMargin = ui.triggerBounds.top + ui.offsetY - rootBounds.top
             })
         }
-        showingContainerUi[viewId] = menuUi
+        showingContainerUi[viewId] = ui
     }
 
     private fun changeFocus(viewId: Int, x: Float, y: Float): Boolean {
