1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Override virtual method in private class instead of downcasting

Browse Source 
Move QGraphicsView specific code into reimplementation of now virtual
(and const) canStartScrollingAt.

Remove unhelpful comment.

Change-Id: Ib4799e48ac4f85748c77c52d29511a0490303676
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-04-07 19:45:41 +02:00
parent e349f787d5
commit c8dea4a833
4 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/widgets/graphicsview/qgraphicsview.cpp
View File

@ -613,6 +613,26 @@ void QGraphicsViewPrivate::updateScroll()
dirtyScroll = false; dirtyScroll = false;
} }
/*!
\internal
* don't start scrolling when a drag mode has been set
* don't start scrolling on a movable item
*/
bool QGraphicsViewPrivate::canStartScrollingAt(const QPoint &startPos) const
{
Q_Q(const QGraphicsView);
if (q->dragMode() != QGraphicsView::NoDrag)
return false;
const QGraphicsItem *childItem = q->itemAt(startPos);
if (childItem && (childItem->flags() & QGraphicsItem::ItemIsMovable))
return false;
return QAbstractScrollAreaPrivate::canStartScrollingAt(startPos);
}
/*! /*!
\internal \internal
*/ */

1
src/widgets/graphicsview/qgraphicsview_p.h
View File

@ -117,6 +117,7 @@ public:
QTransform matrix; QTransform matrix;
qint64 scrollX, scrollY; qint64 scrollX, scrollY;
void updateScroll(); void updateScroll();
bool canStartScrollingAt(const QPoint &startPos) const override;
qreal leftIndent; qreal leftIndent;
qreal topIndent; qreal topIndent;

21
src/widgets/widgets/qabstractscrollarea.cpp
View File

@ -1361,28 +1361,13 @@ void QAbstractScrollArea::scrollContentsBy(int, int)
viewport()->update(); viewport()->update();
} }
bool QAbstractScrollAreaPrivate::canStartScrollingAt( const QPoint &startPos ) bool QAbstractScrollAreaPrivate::canStartScrollingAt(const QPoint &startPos) const
{ {
Q_Q(QAbstractScrollArea); Q_Q(const QAbstractScrollArea);
#if QT_CONFIG(graphicsview)
// don't start scrolling when a drag mode has been set.
// don't start scrolling on a movable item.
if (QGraphicsView *view = qobject_cast<QGraphicsView *>(q)) {
if (view->dragMode() != QGraphicsView::NoDrag)
return false;
QGraphicsItem *childItem = view->itemAt(startPos);
if (childItem && (childItem->flags() & QGraphicsItem::ItemIsMovable))
return false;
}
#endif
// don't start scrolling on a QAbstractSlider // don't start scrolling on a QAbstractSlider
if (qobject_cast<QAbstractSlider *>(q->viewport()->childAt(startPos))) { if (qobject_cast<QAbstractSlider *>(q->viewport()->childAt(startPos)))
return false; return false;
}
return true; return true;
} }

3
src/widgets/widgets/qabstractscrollarea_p.h
View File

@ -94,9 +94,8 @@ public:
void init(); void init();
void layoutChildren(); void layoutChildren();
void layoutChildren_helper(bool *needHorizontalScrollbar, bool *needVerticalScrollbar); void layoutChildren_helper(bool *needHorizontalScrollbar, bool *needVerticalScrollbar);
// ### Fix for 4.4, talk to Bjoern E or Girish.
virtual void scrollBarPolicyChanged(Qt::Orientation, Qt::ScrollBarPolicy) {} virtual void scrollBarPolicyChanged(Qt::Orientation, Qt::ScrollBarPolicy) {}
bool canStartScrollingAt( const QPoint &startPos ); virtual bool canStartScrollingAt( const QPoint &startPos ) const;
void flashScrollBars(); void flashScrollBars();
void setScrollBarTransient(QScrollBar *scrollBar, bool transient); void setScrollBarTransient(QScrollBar *scrollBar, bool transient);