Drop scene initialization functions
They are not needed anymore since the scenes are created when workspace exists.
This commit is contained in:
parent
fc148cb668
commit
7c43f56665
5 changed files with 9 additions and 26 deletions
|
@ -182,10 +182,6 @@ void WaylandCompositor::start()
|
|||
|
||||
Q_EMIT sceneCreated();
|
||||
|
||||
Q_ASSERT(m_scene);
|
||||
m_scene->initialize();
|
||||
m_cursorScene->initialize();
|
||||
|
||||
const QList<Output *> outputs = workspace()->outputs();
|
||||
for (Output *output : outputs) {
|
||||
addOutput(output);
|
||||
|
|
|
@ -330,9 +330,6 @@ void X11Compositor::start()
|
|||
|
||||
kwinApp()->setX11CompositeWindow(backend()->overlayWindow()->window());
|
||||
|
||||
Q_ASSERT(m_scene);
|
||||
m_scene->initialize();
|
||||
|
||||
auto workspaceLayer = new RenderLayer(workspace()->outputs()[0]->renderLoop());
|
||||
workspaceLayer->setDelegate(std::make_unique<SceneDelegate>(m_scene.get(), nullptr));
|
||||
workspaceLayer->setGeometry(workspace()->geometry());
|
||||
|
|
|
@ -17,6 +17,11 @@ namespace KWin
|
|||
CursorScene::CursorScene(std::unique_ptr<ItemRenderer> &&renderer)
|
||||
: Scene(std::move(renderer))
|
||||
{
|
||||
m_rootItem = std::make_unique<CursorItem>(this);
|
||||
setGeometry(m_rootItem->boundingRect().toRect());
|
||||
connect(m_rootItem.get(), &Item::boundingRectChanged, this, [this]() {
|
||||
setGeometry(m_rootItem->boundingRect().toRect());
|
||||
});
|
||||
}
|
||||
|
||||
CursorScene::~CursorScene()
|
||||
|
@ -26,15 +31,6 @@ CursorScene::~CursorScene()
|
|||
m_rootItem.reset();
|
||||
}
|
||||
|
||||
void CursorScene::initialize()
|
||||
{
|
||||
m_rootItem = std::make_unique<CursorItem>(this);
|
||||
setGeometry(m_rootItem->boundingRect().toRect());
|
||||
connect(m_rootItem.get(), &Item::boundingRectChanged, this, [this]() {
|
||||
setGeometry(m_rootItem->boundingRect().toRect());
|
||||
});
|
||||
}
|
||||
|
||||
static void resetRepaintsHelper(Item *item, SceneDelegate *delegate)
|
||||
{
|
||||
item->resetRepaints(delegate);
|
||||
|
|
|
@ -22,8 +22,6 @@ public:
|
|||
explicit CursorScene(std::unique_ptr<ItemRenderer> &&renderer);
|
||||
~CursorScene() override;
|
||||
|
||||
void initialize();
|
||||
|
||||
void prePaint(SceneDelegate *delegate) override;
|
||||
void postPaint() override;
|
||||
void paint(const RenderTarget &renderTarget, const QRegion ®ion) override;
|
||||
|
|
|
@ -85,14 +85,6 @@ namespace KWin
|
|||
WorkspaceScene::WorkspaceScene(std::unique_ptr<ItemRenderer> renderer)
|
||||
: Scene(std::move(renderer))
|
||||
, m_containerItem(std::make_unique<Item>(this))
|
||||
{
|
||||
}
|
||||
|
||||
WorkspaceScene::~WorkspaceScene()
|
||||
{
|
||||
}
|
||||
|
||||
void WorkspaceScene::initialize()
|
||||
{
|
||||
setGeometry(workspace()->geometry());
|
||||
connect(workspace(), &Workspace::geometryChanged, this, [this]() {
|
||||
|
@ -105,6 +97,10 @@ void WorkspaceScene::initialize()
|
|||
}
|
||||
}
|
||||
|
||||
WorkspaceScene::~WorkspaceScene()
|
||||
{
|
||||
}
|
||||
|
||||
void WorkspaceScene::createDndIconItem()
|
||||
{
|
||||
DragAndDropIcon *dragIcon = waylandServer()->seat()->dragIcon();
|
||||
|
|
Loading…
Reference in a new issue