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

class names shortened

This commit is contained in:
Uwe Rathmann 2023-12-08 15:47:32 +01:00
parent ff1b479938
commit 162534c13c
6 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
playground/parrots/BlurredTextureNode.cpp → playground/parrots/BlurringNode.cpp
View File

@ -3,7 +3,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*****************************************************************************/
#include "BlurredTextureNode.h"
#include "BlurringNode.h"
#include <qsgmaterialshader.h>
#include <qsgmaterial.h>
@ -118,10 +118,10 @@ QSGMaterialShader* Material::createShader(
return new MaterialShader();
}
class BlurredTextureNodePrivate final : public QSGGeometryNodePrivate
class BlurringNodePrivate final : public QSGGeometryNodePrivate
{
public:
BlurredTextureNodePrivate()
BlurringNodePrivate()
: geometry( QSGGeometry::defaultAttributes_TexturedPoint2D(), 4 )
{
}
@ -132,32 +132,32 @@ class BlurredTextureNodePrivate final : public QSGGeometryNodePrivate
QRectF rect;
};
BlurredTextureNode::BlurredTextureNode()
: QSGGeometryNode( *new BlurredTextureNodePrivate )
BlurringNode::BlurringNode()
: QSGGeometryNode( *new BlurringNodePrivate )
{
Q_D( BlurredTextureNode );
Q_D( BlurringNode );
setMaterial( &d->material );
setGeometry( &d->geometry );
}
BlurredTextureNode::~BlurredTextureNode()
BlurringNode::~BlurringNode()
{
}
void BlurredTextureNode::setTexture( QSGTexture* texture )
void BlurringNode::setTexture( QSGTexture* texture )
{
d_func()->material.texture = texture;
}
QSGTexture* BlurredTextureNode::texture()
QSGTexture* BlurringNode::texture()
{
return d_func()->material.texture;
}
void BlurredTextureNode::setRect( const QRectF& rect )
void BlurringNode::setRect( const QRectF& rect )
{
Q_D( BlurredTextureNode );
Q_D( BlurringNode );
if ( rect == d->rect )
return;
@ -193,7 +193,7 @@ void BlurredTextureNode::setRect( const QRectF& rect )
markDirty( QSGNode::DirtyGeometry );
}
QRectF BlurredTextureNode::rect() const
QRectF BlurringNode::rect() const
{
return d_func()->rect;
}

10
playground/parrots/BlurredTextureNode.h → playground/parrots/BlurringNode.h
View File

@ -9,15 +9,15 @@
class QRect;
class QSGTexture;
class BlurredTextureNodePrivate;
class BlurringNodePrivate;
class BlurredTextureNode : public QSGGeometryNode
class BlurringNode : public QSGGeometryNode
{
using Inherited = QSGGeometryNode;
public:
BlurredTextureNode();
~BlurredTextureNode();
BlurringNode();
~BlurringNode();
void setTexture( QSGTexture* );
QSGTexture* texture();
@ -26,5 +26,5 @@ class BlurredTextureNode : public QSGGeometryNode
QRectF rect() const;
private:
Q_DECLARE_PRIVATE( BlurredTextureNode )
Q_DECLARE_PRIVATE( BlurringNode )
};

4
playground/parrots/CMakeLists.txt
View File

@ -4,8 +4,8 @@
############################################################################
set(SOURCES
BlurredOverlay.h BlurredOverlay.cpp
BlurredTextureNode.h BlurredTextureNode.cpp
Overlay.h Overlay.cpp
BlurringNode.h BlurringNode.cpp
main.cpp)
qt_add_resources(SOURCES images.qrc shaders.qrc)

37
playground/parrots/BlurredOverlay.cpp → playground/parrots/Overlay.cpp
View File

@ -3,8 +3,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*****************************************************************************/
#include "BlurredOverlay.h"
#include "BlurredTextureNode.h"
#include "Overlay.h"
#include "BlurringNode.h"
#include <private/qquickitem_p.h>
#include <private/qquickwindow_p.h>
@ -27,7 +27,7 @@ namespace
};
}
class BlurredOverlayPrivate final : public QQuickItemPrivate, public QQuickItemChangeListener
class OverlayPrivate final : public QQuickItemPrivate, public QQuickItemChangeListener
{
public:
@ -108,7 +108,7 @@ class BlurredOverlayPrivate final : public QQuickItemPrivate, public QQuickItemC
void updateTexture( QSGLayer* layer )
{
Q_Q( BlurredOverlay );
Q_Q( Overlay );
const auto pixelRatio = q->window()->effectiveDevicePixelRatio();
@ -138,29 +138,28 @@ class BlurredOverlayPrivate final : public QQuickItemPrivate, public QQuickItemC
QPointer< QQuickItem > grabbedItem;
bool covering = false;
Q_DECLARE_PUBLIC(BlurredOverlay)
Q_DECLARE_PUBLIC(Overlay)
};
BlurredOverlay::BlurredOverlay( QQuickItem* parent )
: QQuickItem( *new BlurredOverlayPrivate(), parent )
Overlay::Overlay( QQuickItem* parent )
: QQuickItem( *new OverlayPrivate(), parent )
{
setFlag( ItemHasContents );
}
BlurredOverlay::~BlurredOverlay()
Overlay::~Overlay()
{
Q_D( BlurredOverlay );
d->setAttached( false );
d_func()->setAttached( false );
}
QQuickItem*BlurredOverlay::grabbedItem() const
QQuickItem*Overlay::grabbedItem() const
{
return d_func()->grabbedItem;
}
void BlurredOverlay::setGrabbedItem( QQuickItem* item )
void Overlay::setGrabbedItem( QQuickItem* item )
{
Q_D( BlurredOverlay );
Q_D( Overlay );
if ( item == d->grabbedItem )
return;
@ -172,7 +171,7 @@ void BlurredOverlay::setGrabbedItem( QQuickItem* item )
update();
}
void BlurredOverlay::geometryChange(
void Overlay::geometryChange(
const QRectF& newGeometry, const QRectF& oldGeometry )
{
Inherited::geometryChange( newGeometry, oldGeometry );
@ -186,7 +185,7 @@ void BlurredOverlay::geometryChange(
update();
}
QSGNode* BlurredOverlay::updatePaintNode( QSGNode* oldNode, UpdatePaintNodeData* )
QSGNode* Overlay::updatePaintNode( QSGNode* oldNode, UpdatePaintNodeData* )
{
if ( size().isEmpty() )
{
@ -194,13 +193,13 @@ QSGNode* BlurredOverlay::updatePaintNode( QSGNode* oldNode, UpdatePaintNodeData*
return nullptr;
}
Q_D( BlurredOverlay );
Q_D( Overlay );
auto node = static_cast< BlurredTextureNode* >( oldNode );
auto node = static_cast< BlurringNode* >( oldNode );
if ( node == nullptr )
{
node = new BlurredTextureNode();
node = new BlurringNode();
auto layer = d->createTexture();
node->setTexture( layer );
@ -228,4 +227,4 @@ QSGNode* BlurredOverlay::updatePaintNode( QSGNode* oldNode, UpdatePaintNodeData*
return node;
}
#include "moc_BlurredOverlay.cpp"
#include "moc_Overlay.cpp"

10
playground/parrots/BlurredOverlay.h → playground/parrots/Overlay.h
View File

@ -7,17 +7,17 @@
#include <qquickitem.h>
class BlurredOverlayPrivate;
class OverlayPrivate;
class BlurredOverlay : public QQuickItem
class Overlay : public QQuickItem
{
Q_OBJECT
using Inherited = QQuickItem;
public:
BlurredOverlay( QQuickItem* = nullptr );
~BlurredOverlay() override;
Overlay( QQuickItem* = nullptr );
~Overlay() override;
QQuickItem* grabbedItem() const;
void setGrabbedItem( QQuickItem* );
@ -27,5 +27,5 @@ class BlurredOverlay : public QQuickItem
QSGNode* updatePaintNode( QSGNode*, UpdatePaintNodeData* ) override;
private:
Q_DECLARE_PRIVATE( BlurredOverlay )
Q_DECLARE_PRIVATE( Overlay )
};

13
playground/parrots/main.cpp
View File

@ -20,7 +20,7 @@
#include <SkinnyShortcut.h>
#include <cmath>
#include "BlurredOverlay.h"
#include "Overlay.h"
class ButtonBox : public QskLinearBox
{
@ -42,14 +42,16 @@ class ButtonBox : public QskLinearBox
}
};
class Overlay : public BlurredOverlay
class OverlayBox : public Overlay
{
using Inherited = BlurredOverlay;
using Inherited = Overlay;
public:
Overlay( QQuickItem* parent = nullptr )
OverlayBox( QQuickItem* parent = nullptr )
: Inherited( parent )
{
if ( parent )
setGrabbedItem( parent );
}
protected:
@ -134,8 +136,7 @@ class MainView : public QskControl
m_background = new BackgroundItem( this );
m_overlay = new Overlay( m_background );
m_overlay->setGrabbedItem( m_background );
m_overlay = new OverlayBox( m_background );
(void )new ButtonBox( m_overlay );
}