From fd7162b6b7fab16b6edd8c1f2edc0f582c1e2597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 3 Jun 2024 20:05:52 -0700
Subject: [PATCH] Don't expand window for popovers on Wayland

---
 src/PanelWindow.vala             | 5 +++++
 src/Services/PopoverManager.vala | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/PanelWindow.vala b/src/PanelWindow.vala
index 9eca83c4..3ef113ae 100644
--- a/src/PanelWindow.vala
+++ b/src/PanelWindow.vala
@@ -222,6 +222,11 @@ public class Wingpanel.PanelWindow : Gtk.Window {
     }
 
     public void set_expanded (bool expand) {
+        // This is a workaround for X11
+        if (Utils.is_wayland ()) {
+            return;
+        }
+
         if (expand && !this.expanded) {
             Services.BackgroundManager.get_default ().remember_window ();
 
diff --git a/src/Services/PopoverManager.vala b/src/Services/PopoverManager.vala
index a690cf5a..5a76c1c4 100644
--- a/src/Services/PopoverManager.vala
+++ b/src/Services/PopoverManager.vala
@@ -57,6 +57,8 @@ public class Wingpanel.Services.PopoverManager : Object {
                 owner.set_expanded (true);
                 make_modal (popover, true);
                 owner.present ();
+                popover.constrain_to = NONE;
+                popover.position = BOTTOM;
                 popover.popup ();
                 popover.show_all ();
                 _current_indicator.base_indicator.opened ();