fix: submenu position not right

as title pms: Bug-288131
linuxdeepin · Dec 31, 2024 · b988e5f · b988e5f
1 parent 96d5757
commit b988e5f
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/tray-wayland-integration/pluginmanager.cpp b/src/tray-wayland-integration/pluginmanager.cpp
@@ -53,8 +53,9 @@ bool PluginManager::tryCreatePopupForSubWindow(QWindow *window)
         pluginPopup->setPopupType(Plugin::PluginPopup::PopupTypeTooltip);
         pluginPopup->setPluginId(plugin->pluginId());
         pluginPopup->setItemKey(plugin->itemKey());
-        pluginPopup->setX(parentWindow->x() + window->x());
-        pluginPopup->setY(parentWindow->y() + window->y());
+        auto pluginPos = plugin->pluginPos();
+        pluginPopup->setX(pluginPos.x() + window->x());
+        pluginPopup->setY(pluginPos.y() + window->y());
         return true;
     }
 
@@ -63,10 +64,10 @@ bool PluginManager::tryCreatePopupForSubWindow(QWindow *window)
         pluginPopup->setPopupType(Plugin::PluginPopup::PopupTypeSubPopup);
         pluginPopup->setPluginId(plugin->pluginId());
         pluginPopup->setItemKey(plugin->itemKey());
-        auto geometry = parentWindow->geometry();
+        auto parentPos = plugin->pluginPos();
         // TODO move to parentWindow's right position.
-        pluginPopup->setX(geometry.right());
-        pluginPopup->setY(window->y());
+        pluginPopup->setX(parentPos.x() + parentWindow->width());
+        pluginPopup->setY(parentPos.y() + window->y());
         return true;
     }