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

avoid Qt 5/6 incompatibilities

This commit is contained in:
Uwe Rathmann 2020-10-25 17:53:22 +01:00
parent 571f532307
commit 963ccb1da8
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/controls/QskScrollArea.cpp
View File

@ -213,9 +213,8 @@ namespace
bool event( QEvent* event ) override; bool event( QEvent* event ) override;
void itemChange( ItemChange, const ItemChangeData& ) override; void itemChange( ItemChange, const ItemChangeData& ) override;
void geometryChanged( const QRectF&, const QRectF& ) override;
#if QT_VERSION >= QT_VERSION_CHECK( 5, 8, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 5, 8, 0 )
void itemGeometryChanged( QQuickItem*, void itemGeometryChanged( QQuickItem*,
QQuickGeometryChange change, const QRectF& ) override QQuickGeometryChange change, const QRectF& ) override
{ {
@ -223,14 +222,14 @@ namespace
scrollArea()->polish(); scrollArea()->polish();
} }
#else #else
void itemGeometryChanged( QQuickItem*, void itemGeometryChanged( QQuickItem*,
const QRectF& newRect, const QRectF& oldRect ) override const QRectF& newRect, const QRectF& oldRect ) override
{ {
if ( m_isSizeChangedEnabled && ( oldRect.size() != newRect.size() ) ) if ( m_isSizeChangedEnabled && ( oldRect.size() != newRect.size() ) )
scrollArea()->polish(); scrollArea()->polish();
} }
#endif #endif
void updateNode( QSGNode* ) override; void updateNode( QSGNode* ) override;
@ -331,18 +330,6 @@ namespace
return nullptr; return nullptr;
} }
void ClipItem::geometryChanged(
const QRectF& newRect, const QRectF& oldRect )
{
Inherited::geometryChanged( newRect, oldRect );
if ( newRect.size() != oldRect.size() )
{
// we need to restore the clip node
update();
}
}
void ClipItem::itemChange( void ClipItem::itemChange(
QQuickItem::ItemChange change, const QQuickItem::ItemChangeData& value ) QQuickItem::ItemChange change, const QQuickItem::ItemChangeData& value )
{ {
@ -376,11 +363,22 @@ namespace
bool ClipItem::event( QEvent* event ) bool ClipItem::event( QEvent* event )
{ {
if ( event->type() == QEvent::LayoutRequest ) const int eventType = event->type();
if ( eventType == QEvent::LayoutRequest )
{ {
if ( scrollArea()->isItemResizable() ) if ( scrollArea()->isItemResizable() )
scrollArea()->polish(); scrollArea()->polish();
} }
else if ( eventType == QskEvent::GeometryChange )
{
auto geometryEvent = static_cast< const QskGeometryChangeEvent* >( event );
if ( geometryEvent->isResized() )
{
// we need to restore the clip node
update();
}
}
return Inherited::event( event ); return Inherited::event( event );
} }