kosslan/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

core/menu: add QsMenuAnchor for more control of platform menus

Browse source
This commit is contained in:
outfoxxed 2024-07-25 20:44:26 -07:00
parent 54350277be
commit 6b9b1fcb53
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
10 changed files with 245 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/wayland/platformmenu.cpp
View file

@ -15,15 +15,6 @@ using namespace qs::menu::platform;
void platformMenuHook(PlatformMenuQMenu* menu) {
auto* window = menu->windowHandle();
auto constraintAdjustment = QtWayland::xdg_positioner::constraint_adjustment_flip_x
| QtWayland::xdg_positioner::constraint_adjustment_flip_y
| QtWayland::xdg_positioner::constraint_adjustment_slide_x
| QtWayland::xdg_positioner::constraint_adjustment_slide_y
| QtWayland::xdg_positioner::constraint_adjustment_resize_x
| QtWayland::xdg_positioner::constraint_adjustment_resize_y;
window->setProperty("_q_waylandPopupConstraintAdjustment", constraintAdjustment);
Qt::Edges anchor;
Qt::Edges gravity;
@ -43,6 +34,9 @@ void platformMenuHook(PlatformMenuQMenu* menu) {
anchor = Qt::TopEdge | sideEdge;
gravity = Qt::BottomEdge | sideEdge;
} else if (auto* parent = window->transientParent()) {
// abort if already set by a PopupAnchor
if (window->property("_q_waylandPopupAnchorRect").isValid()) return;
// The menu geometry will be adjusted to flip internally by qt already, but it ends up off by
// one pixel which causes the compositor to also flip which results in the menu being placed
// left of the edge by its own width. To work around this the intended position is stored prior
@ -56,6 +50,15 @@ void platformMenuHook(PlatformMenuQMenu* menu) {
window->setProperty("_q_waylandPopupAnchor", QVariant::fromValue(anchor));
window->setProperty("_q_waylandPopupGravity", QVariant::fromValue(gravity));
auto constraintAdjustment = QtWayland::xdg_positioner::constraint_adjustment_flip_x
| QtWayland::xdg_positioner::constraint_adjustment_flip_y
| QtWayland::xdg_positioner::constraint_adjustment_slide_x
| QtWayland::xdg_positioner::constraint_adjustment_slide_y
| QtWayland::xdg_positioner::constraint_adjustment_resize_x
| QtWayland::xdg_positioner::constraint_adjustment_resize_y;
window->setProperty("_q_waylandPopupConstraintAdjustment", constraintAdjustment);
}
void installPlatformMenuHook() { PlatformMenuEntry::registerCreationHook(&platformMenuHook); }