qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QQuickSelectionRectangle: Don't leak the handles 

As we create them via QQmlComponent::create() we are responsible for
getting rid of them.

Change-Id: I1c836e731d57061a30185484b4b53c5643df08a7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Ulf Hermann 2021-12-01 15:34:17 +01:00
parent 8762e2fb68
commit fa60900205
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/quicktemplates2/qquickselectionrectangle.cpp
View File

@ -169,7 +169,7 @@ QQuickSelectionRectanglePrivate::QQuickSelectionRectanglePrivate()
m_dragHandler->setTarget(nullptr);
QObject::connect(&m_scrollTimer, &QTimer::timeout, [&]{
if (m_topLeftHandle && m_draggedHandle == m_topLeftHandle)
if (m_topLeftHandle && m_draggedHandle == m_topLeftHandle.data())
m_selectable->setSelectionStartPos(m_scrollToPoint);
else
m_selectable->setSelectionEndPos(m_scrollToPoint);
@ -253,13 +253,13 @@ QQuickItem *QQuickSelectionRectanglePrivate::handleUnderPos(const QPointF &pos)
if (m_topLeftHandle) {
const QPointF localPos = m_topLeftHandle->mapFromItem(handlerTarget, pos);
if (m_topLeftHandle->contains(localPos))
return m_topLeftHandle;
return m_topLeftHandle.data();
}
if (m_bottomRightHandle) {
const QPointF localPos = m_bottomRightHandle->mapFromItem(handlerTarget, pos);
if (m_bottomRightHandle->contains(localPos))
return m_bottomRightHandle;
return m_bottomRightHandle.data();
}
return nullptr;
@ -359,10 +359,10 @@ void QQuickSelectionRectanglePrivate::updateHandles()
const QRectF rect = m_selectable->selectionRectangle().normalized();
if (!m_topLeftHandle && m_topLeftHandleDelegate)
m_topLeftHandle = createHandle(m_topLeftHandleDelegate, Qt::TopLeftCorner);
m_topLeftHandle.reset(createHandle(m_topLeftHandleDelegate, Qt::TopLeftCorner));
if (!m_bottomRightHandle && m_bottomRightHandleDelegate)
m_bottomRightHandle = createHandle(m_bottomRightHandleDelegate, Qt::BottomRightCorner);
m_bottomRightHandle.reset(createHandle(m_bottomRightHandleDelegate, Qt::BottomRightCorner));
if (m_topLeftHandle) {
m_topLeftHandle->setX(rect.x() - (m_topLeftHandle->width() / 2));

6
src/quicktemplates2/qquickselectionrectangle_p_p.h
View File

@ -88,9 +88,9 @@ public:
QQmlComponent *m_topLeftHandleDelegate = nullptr;
QQmlComponent *m_bottomRightHandleDelegate = nullptr;
QPointer<QQuickItem> m_topLeftHandle;
QPointer<QQuickItem> m_bottomRightHandle;
QPointer<QQuickItem> m_draggedHandle = nullptr;
QScopedPointer<QQuickItem> m_topLeftHandle;
QScopedPointer<QQuickItem> m_bottomRightHandle;
QPointer<QQuickItem> m_draggedHandle;
QQuickSelectable *m_selectable = nullptr;