diff options
| author | Vaxry <vaxry@vaxry.net> | 2025-02-01 15:08:30 +0000 |
|---|---|---|
| committer | Vaxry <vaxry@vaxry.net> | 2025-02-01 15:08:30 +0000 |
| commit | c6f672257bd2ae98f4fd7a6a273b2d1d3e944baa (patch) | |
| tree | 3b331626749173588719ac4303dd347af0820e5e /src/desktop/Window.cpp | |
| parent | 5b43c106bd1cde9ac0b5626130890cde4de0b245 (diff) | |
desktop: move popup and subsurface ctors to factories
makes sure m_pSelf is set before we do anything like possibly adding children
fixes #9275
supersedes #9276
Diffstat (limited to 'src/desktop/Window.cpp')
| -rw-r--r-- | src/desktop/Window.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/desktop/Window.cpp b/src/desktop/Window.cpp index 0f6bac99..6e580e49 100644 --- a/src/desktop/Window.cpp +++ b/src/desktop/Window.cpp @@ -571,10 +571,8 @@ void CWindow::onMap() { if (m_bIsX11) return; - m_pSubsurfaceHead = makeUnique<CSubsurface>(m_pSelf.lock()); - m_pSubsurfaceHead->m_pSelf = m_pSubsurfaceHead; - m_pPopupHead = makeUnique<CPopup>(m_pSelf.lock()); - m_pPopupHead->m_pSelf = m_pPopupHead; + m_pSubsurfaceHead = CSubsurface::create(m_pSelf.lock()); + m_pPopupHead = CPopup::create(m_pSelf.lock()); } void CWindow::onBorderAngleAnimEnd(WP<CBaseAnimatedVariable> pav) { |