From 2e111c8cf97d391c25fc6263660271fab605ece1 Mon Sep 17 00:00:00 2001 From: Vaxry Date: Thu, 29 Feb 2024 14:26:02 +0000 Subject: xdg: rewrite entire popup implementation --- src/desktop/Subsurface.hpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/desktop/Subsurface.hpp') diff --git a/src/desktop/Subsurface.hpp b/src/desktop/Subsurface.hpp index 22692192..a8babd70 100644 --- a/src/desktop/Subsurface.hpp +++ b/src/desktop/Subsurface.hpp @@ -5,15 +5,17 @@ #include "WLSurface.hpp" class CWindow; -struct SXDGPopup; +class CPopup; class CSubsurface { public: // root dummy nodes CSubsurface(CWindow* pOwner); + CSubsurface(CPopup* pOwner); // real nodes CSubsurface(wlr_subsurface* pSubsurface, CWindow* pOwner); + CSubsurface(wlr_subsurface* pSubsurface, CPopup* pOwner); ~CSubsurface(); @@ -29,7 +31,6 @@ class CSubsurface { void recheckDamageForSubsurfaces(); private: - DYNLISTENER(destroySubsurface); DYNLISTENER(commitSubsurface); DYNLISTENER(newSubsurface); @@ -44,9 +45,12 @@ class CSubsurface { CSubsurface* m_pParent = nullptr; CWindow* m_pWindowParent = nullptr; + CPopup* m_pPopupParent = nullptr; std::vector> m_vChildren; + bool m_bInert = false; + void initSignals(); void initExistingSubsurfaces(); void checkSiblingDamage(); -- cgit v1.2.3