aland/quickshell
1
0
Fork 0
mirror of https://git.outfoxxed.me/quickshell/quickshell.git synced 2026-04-10 06:11:54 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

wayland: use patched surfaceRole accessor on FreeBSD

Browse source
This commit is contained in:
-k 2026-03-16 17:40:55 -04:00 • committed by outfoxxed
parent 97b2688ad6
commit a51dcd0a01
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/wayland/wlr_layershell/surface.cpp
View file

@ -17,6 +17,7 @@
#include <qvariant.h> #include <qvariant.h>
#include <qwayland-wlr-layer-shell-unstable-v1.h> #include <qwayland-wlr-layer-shell-unstable-v1.h>
#include <qwindow.h> #include <qwindow.h>
#include <wayland-xdg-shell-client-protocol.h>
#include "../../window/panelinterface.hpp" #include "../../window/panelinterface.hpp"
#include "shell_integration.hpp" #include "shell_integration.hpp"
@ -247,9 +248,19 @@ void LayerSurface::commit() {
} }
void LayerSurface::attachPopup(QtWaylandClient::QWaylandShellSurface* popup) { void LayerSurface::attachPopup(QtWaylandClient::QWaylandShellSurface* popup) {
std::any role = popup->surfaceRole(); #ifdef __FreeBSD__
// FreeBSD uses an alternate RTTI matching strategy by default which does
if (auto* popupRole = std::any_cast<::xdg_popup*>(&role)) { // NOLINT // not work across modules, preventing std::any from downcasting. On
// FreeBSD, Qt is built with a patch to expose the surface role through a
// pointer instead of an any, which does not have this problem.
// See https://bugs.kde.org/show_bug.cgi?id=479679
if (auto* xdgPopup = static_cast<::xdg_popup*>(popup->nativeResource("xdg_popup"))) {
this->get_popup(xdgPopup);
return;
}
#endif
auto role = popup->surfaceRole(); // NOLINT
if (auto* popupRole = std::any_cast<::xdg_popup*>(&role)) {
this->get_popup(*popupRole); this->get_popup(*popupRole);
} else { } else {
qWarning() << "Cannot attach popup" << popup << "to shell surface" << this qWarning() << "Cannot attach popup" << popup << "to shell surface" << this