Skip to content

Make popups work on layer shells and fix incorrect cast #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vaxerski merged 2 commits into from
Aug 3, 2026
Merged

Make popups work on layer shells and fix incorrect cast #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aea0adf
window/popup: change popups to use IWaylandWindow not CWaylandWindow
BlueZeeKing Aug 1, 2026
98ac7c5
window/popup: make popups work on layers
BlueZeeKing Aug 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/window/IWaylandWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ void IWaylandWindow::setCursor(ePointerShape shape) {
}

SP<IWindow> IWaylandWindow::openPopup(const SWindowCreationData& data) {
auto x = makeShared<CWaylandPopup>(data, reinterpretPointerCast<CWaylandWindow>(m_self.lock()));
auto x = makeShared<CWaylandPopup>(data, reinterpretPointerCast<IWaylandWindow>(m_self.lock()));
x->m_self = x;
m_popups.emplace_back(x);
return x;
Expand Down
6 changes: 5 additions & 1 deletion src/window/WaylandPopup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "WaylandPopup.hpp"
#include "WaylandWindow.hpp"
#include "WaylandLayer.hpp"

#include <hyprtoolkit/element/Null.hpp>

Expand All @@ -15,7 +16,7 @@
using namespace Hyprtoolkit;
using namespace Hyprutils::Math;

CWaylandPopup::CWaylandPopup(const SWindowCreationData& data, SP<CWaylandWindow> window) : m_parent(window), m_creationData(data) {
CWaylandPopup::CWaylandPopup(const SWindowCreationData& data, SP<IWaylandWindow> window) : m_parent(window), m_creationData(data) {
m_rootElement = CNullBuilder::begin()->commence();
}

Expand Down Expand Up @@ -65,6 +66,9 @@ void CWaylandPopup::open() {

m_wlPopupState.xdgPopup = makeShared<CCXdgPopup>(m_waylandState.xdgSurface->sendGetPopup(m_parent->m_waylandState.xdgSurface.get(), m_wlPopupState.xdgPositioner.get()));

if (dynamicPointerCast<CWaylandLayer>(m_parent))
dynamicPointerCast<CWaylandLayer>(m_parent)->m_layerState.layerSurface->sendGetPopup(m_wlPopupState.xdgPopup->resource());

if (!m_wlPopupState.xdgPopup->resource()) {
g_logger->log(HT_LOG_ERROR, "window opening failed: no xdgToplevel given. Errno: {}", errno);
return;
Expand Down
6 changes: 3 additions & 3 deletions src/window/WaylandPopup.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ namespace Hyprtoolkit {
// TODO: de-dup this shit
class CWaylandPopup : public IWaylandWindow {
public:
CWaylandPopup(const SWindowCreationData& data, SP<CWaylandWindow> parent);
CWaylandPopup(const SWindowCreationData& data, SP<IWaylandWindow> parent);
virtual ~CWaylandPopup();

virtual void close();
virtual void open();
virtual Hyprutils::Memory::CSharedPointer<IWindow> openPopup(const SWindowCreationData& data);

private:
WP<CWaylandWindow> m_parent;
WP<IWaylandWindow> m_parent;
SWindowCreationData m_creationData;

struct {
Expand All @@ -29,4 +29,4 @@ namespace Hyprtoolkit {
friend class CWaylandPlatform;
friend class CWaylandWindow;
};
};
};
Loading