fix: DNotitlebarWindowHelper can't be removed from mapped

18202781743 · 18202781743 · commit 259373eedce2 · 2025-01-09T14:26:51.000+08:00
qobject_cast&lt;QWindow*&gt;(window) is returned nullptr if window is destroyed in qt6, and we can see it on tst_QWindow::qobject_castOnDestruction() in tst_qwindow.cpp.

pms: BUG-299239
diff --git a/wayland/dwayland/dnotitlebarwindowhelper_wl.cpp b/wayland/dwayland/dnotitlebarwindowhelper_wl.cpp
@@ -50,7 +50,7 @@ DNoTitlebarWlWindowHelper::~DNoTitlebarWlWindowHelper()
         VtableHook::resetVtable(m_window);
     }
 
-    mapped.remove(qobject_cast<QWindow*>(parent()));
+    mapped.remove(static_cast<QWindow*>(parent()));
 
     // TODO
     // if (m_window->handle()) { // 当本地窗口还存在时，移除设置过的窗口属性
diff --git a/xcb/dnotitlebarwindowhelper.cpp b/xcb/dnotitlebarwindowhelper.cpp
@@ -85,7 +85,7 @@ DNoTitlebarWindowHelper::~DNoTitlebarWindowHelper()
         VtableHook::resetVtable(m_window);
     }
 
-    mapped.remove(qobject_cast<QWindow*>(parent()));
+    mapped.remove(static_cast<QWindow*>(parent()));
 
     if (m_window->handle()) { // 当本地窗口还存在时，移除设置过的窗口属性
         Utility::clearWindowProperty(m_windowID, Utility::internAtom(_DEEPIN_SCISSOR_WINDOW));

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ DNoTitlebarWlWindowHelper::~DNoTitlebarWlWindowHelper()`
`50`	`50`	`VtableHook::resetVtable(m_window);`
`51`	`51`	`}`
`52`	`52`
`53`		`- mapped.remove(qobject_cast<QWindow*>(parent()));`
	`53`	`+ mapped.remove(static_cast<QWindow*>(parent()));`
`54`	`54`
`55`	`55`	`// TODO`
`56`	`56`	`// if (m_window->handle()) { // 当本地窗口还存在时，移除设置过的窗口属性`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ DNoTitlebarWindowHelper::~DNoTitlebarWindowHelper()`
`85`	`85`	`VtableHook::resetVtable(m_window);`
`86`	`86`	`}`
`87`	`87`
`88`		`- mapped.remove(qobject_cast<QWindow*>(parent()));`
	`88`	`+ mapped.remove(static_cast<QWindow*>(parent()));`
`89`	`89`
`90`	`90`	`if (m_window->handle()) { // 当本地窗口还存在时，移除设置过的窗口属性`
`91`	`91`	`Utility::clearWindowProperty(m_windowID, Utility::internAtom(_DEEPIN_SCISSOR_WINDOW));`