From bca7804bb6e1bf5ce5a99b9ae4806be25e36993c Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Sat, 27 Apr 2024 12:43:12 +0100 Subject: internal: Window storage rework - part 1 (#5762) * Window storage rework - part 1 * format * remove useless include * fix pch * format * fix crash in dwindle * fix vram leak * prefer .expired() for bool checks --- src/desktop/Subsurface.hpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/desktop/Subsurface.hpp') diff --git a/src/desktop/Subsurface.hpp b/src/desktop/Subsurface.hpp index b7c0a397..e5094041 100644 --- a/src/desktop/Subsurface.hpp +++ b/src/desktop/Subsurface.hpp @@ -4,17 +4,16 @@ #include #include "WLSurface.hpp" -class CWindow; class CPopup; class CSubsurface { public: // root dummy nodes - CSubsurface(CWindow* pOwner); + CSubsurface(PHLWINDOW pOwner); CSubsurface(CPopup* pOwner); // real nodes - CSubsurface(wlr_subsurface* pSubsurface, CWindow* pOwner); + CSubsurface(wlr_subsurface* pSubsurface, PHLWINDOW pOwner); CSubsurface(wlr_subsurface* pSubsurface, CPopup* pOwner); ~CSubsurface(); @@ -46,8 +45,8 @@ class CSubsurface { // if nullptr, means it's a dummy node CSubsurface* m_pParent = nullptr; - CWindow* m_pWindowParent = nullptr; - CPopup* m_pPopupParent = nullptr; + PHLWINDOWREF m_pWindowParent; + CPopup* m_pPopupParent = nullptr; std::vector> m_vChildren; -- cgit v1.2.3