168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

using the scene root node

This commit is contained in:
Uwe Rathmann 2023-12-12 10:55:30 +01:00
parent 7615cffdd4
commit 048e76d021
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
playground/parrots/Overlay.cpp
View File

@ -8,6 +8,8 @@
#include "SceneTexture.h" #include "SceneTexture.h"
#include <private/qquickitem_p.h> #include <private/qquickitem_p.h>
#include <private/qquickwindow_p.h>
#include <private/qsgrenderer_p.h>
#include <private/qquickitemchangelistener_p.h> #include <private/qquickitemchangelistener_p.h>
#include <qpointer.h> #include <qpointer.h>
@ -63,12 +65,16 @@ class OverlayPrivate final : public QQuickItemPrivate, public QQuickItemChangeLi
QSGRootNode* grabbedNode() QSGRootNode* grabbedNode()
{ {
if ( grabbedItem )
return grabbedItem ? get( grabbedItem )->rootNode() : nullptr; return grabbedItem ? get( grabbedItem )->rootNode() : nullptr;
if ( auto window = q_func()->window() )
{
if ( auto renderer = QQuickWindowPrivate::get( window )->renderer )
return renderer->rootNode();
} }
QSGTransformNode* grabbedItemNode() return nullptr;
{
return grabbedItem ? get( grabbedItem )->itemNode() : nullptr;
} }
QPointer< QQuickItem > grabbedItem; QPointer< QQuickItem > grabbedItem;
@ -110,8 +116,6 @@ void Overlay::geometryChange(
const QRectF& newGeometry, const QRectF& oldGeometry ) const QRectF& newGeometry, const QRectF& oldGeometry )
{ {
Inherited::geometryChange( newGeometry, oldGeometry ); Inherited::geometryChange( newGeometry, oldGeometry );
if ( d_func()->grabbedItem )
update(); update();
} }
@ -119,7 +123,12 @@ QSGNode* Overlay::updatePaintNode( QSGNode* oldNode, UpdatePaintNodeData* )
{ {
Q_D( Overlay ); Q_D( Overlay );
if ( d->grabbedItemNode() == nullptr || size().isEmpty() ) auto grabbedNode = d->grabbedNode();
if ( grabbedNode == nullptr )
QMetaObject::invokeMethod( this, &QQuickItem::update );
if ( grabbedNode == nullptr || size().isEmpty() )
{ {
delete oldNode; delete oldNode;
return nullptr; return nullptr;
@ -146,7 +155,7 @@ QSGNode* Overlay::updatePaintNode( QSGNode* oldNode, UpdatePaintNodeData* )
auto texture = static_cast< SceneTexture* >( node->texture() ); auto texture = static_cast< SceneTexture* >( node->texture() );
texture->setFiltering( smooth() ? QSGTexture::Linear : QSGTexture::Nearest ); texture->setFiltering( smooth() ? QSGTexture::Linear : QSGTexture::Nearest );
texture->render( d->grabbedNode(), itemNode, texture->render( grabbedNode, itemNode,
QRectF( x(), y(), width(), height() ) ); QRectF( x(), y(), width(), height() ) );
itemNode->isBlocked = false; itemNode->isBlocked = false;

2
playground/parrots/main.cpp
View File

@ -50,8 +50,6 @@ class OverlayBox : public Overlay
OverlayBox( QQuickItem* parent = nullptr ) OverlayBox( QQuickItem* parent = nullptr )
: Inherited( parent ) : Inherited( parent )
{ {
if ( parent )
setGrabbedItem( parent );
} }
protected: protected: