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

Qt6 incompatibility

This commit is contained in:
Uwe Rathmann 2020-10-23 14:08:27 +02:00
parent 21bd75ae5b
commit c4b32c0d50
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/controls/QskControlPrivate.cpp
View File

@ -13,6 +13,15 @@ static inline void qskSendEventTo( QObject* object, QEvent::Type type )
QCoreApplication::sendEvent( object, &event ); QCoreApplication::sendEvent( object, &event );
} }
static inline QPointF qskScenePosition( const QMouseEvent* event )
{
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
return event->scenePosition();
#else
return event->windowPos();
#endif
}
/* /*
Qt 5.12: Qt 5.12:
sizeof( QQuickItemPrivate::ExtraData ) -> 184 sizeof( QQuickItemPrivate::ExtraData ) -> 184
@ -204,7 +213,9 @@ bool QskControlPrivate::maybeGesture( QQuickItem* child, QEvent* event )
case QEvent::MouseButtonPress: case QEvent::MouseButtonPress:
{ {
const auto mouseEvent = static_cast< const QMouseEvent* >( event ); const auto mouseEvent = static_cast< const QMouseEvent* >( event );
const QPointF pos = q->mapFromScene( mouseEvent->windowPos() );
auto pos = qskScenePosition( mouseEvent );
pos = q->mapFromScene( pos );
if ( !q->gestureRect().contains( pos ) ) if ( !q->gestureRect().contains( pos ) )
return false; return false;