yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scripting: Mark QObjects returned from invokables as having C++ ownership

Browse source 
Otherwise the script engine may delete them if they have no parent and
there are no more references to them.
This commit is contained in:
David Redondo 2023-02-21 10:53:38 +01:00
parent 18d6159be1
commit 38cd1fc491
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/scripting/workspace_wrapper.cpp
View file

@ -21,6 +21,8 @@
#include "activities.h" #include "activities.h"
#endif #endif
#include <QQmlEngine>
namespace KWin namespace KWin
{ {
@ -281,7 +283,9 @@ void WorkspaceWrapper::hideOutline()
Window *WorkspaceWrapper::getClient(qulonglong windowId) Window *WorkspaceWrapper::getClient(qulonglong windowId)
{ {
return Workspace::self()->findClient(Predicate::WindowMatch, windowId); auto window = Workspace::self()->findClient(Predicate::WindowMatch, windowId);
QQmlEngine::setObjectOwnership(window, QQmlEngine::CppOwnership);
return window;
} }
QSize WorkspaceWrapper::desktopGridSize() const QSize WorkspaceWrapper::desktopGridSize() const
@ -321,7 +325,9 @@ QList<Output *> WorkspaceWrapper::screens() const
Output *WorkspaceWrapper::screenAt(const QPointF &pos) const Output *WorkspaceWrapper::screenAt(const QPointF &pos) const
{ {
return workspace()->outputAt(pos); auto output = workspace()->outputAt(pos);
QQmlEngine::setObjectOwnership(output, QQmlEngine::CppOwnership);
return output;
} }
QRect WorkspaceWrapper::virtualScreenGeometry() const QRect WorkspaceWrapper::virtualScreenGeometry() const
@ -343,14 +349,18 @@ KWin::TileManager *WorkspaceWrapper::tilingForScreen(const QString &screenName)
{ {
Output *output = kwinApp()->outputBackend()->findOutput(screenName); Output *output = kwinApp()->outputBackend()->findOutput(screenName);
if (output) { if (output) {
return workspace()->tileManager(output); auto tileManager = workspace()->tileManager(output);
QQmlEngine::setObjectOwnership(tileManager, QQmlEngine::CppOwnership);
return tileManager;
} }
return nullptr; return nullptr;
} }
KWin::TileManager *WorkspaceWrapper::tilingForScreen(Output *output) const KWin::TileManager *WorkspaceWrapper::tilingForScreen(Output *output) const
{ {
return workspace()->tileManager(output); auto tileManager = workspace()->tileManager(output);
QQmlEngine::setObjectOwnership(tileManager, QQmlEngine::CppOwnership);
return tileManager;
} }
QtScriptWorkspaceWrapper::QtScriptWorkspaceWrapper(QObject *parent) QtScriptWorkspaceWrapper::QtScriptWorkspaceWrapper(QObject *parent)