diff options
Diffstat (limited to 'src/widgets/itemviews/qabstractitemview.cpp')
| -rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 8ba078ffd3..57c3b44aaa 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -55,6 +55,9 @@ #include <qdatetime.h> #include <qlineedit.h> #include <qspinbox.h> +#include <qtreeview.h> +#include <qtableview.h> +#include <qheaderview.h> #include <qstyleditemdelegate.h> #include <private/qabstractitemview_p.h> #include <private/qabstractitemmodel_p.h> @@ -3749,6 +3752,22 @@ void QAbstractItemView::doAutoScroll() QScrollBar *verticalScroll = verticalScrollBar(); QScrollBar *horizontalScroll = horizontalScrollBar(); + // QHeaderView does not (normally) have scrollbars + // It needs to use its parents scroll instead + QHeaderView *hv = qobject_cast<QHeaderView*>(this); + if (hv) { + QAbstractScrollArea *parent = qobject_cast<QAbstractScrollArea*>(parentWidget()); + if (parent) { + if (hv->orientation() == Qt::Horizontal) { + if (!hv->horizontalScrollBar() || !hv->horizontalScrollBar()->isVisible()) + horizontalScroll = parent->horizontalScrollBar(); + } else { + if (!hv->verticalScrollBar() || !hv->verticalScrollBar()->isVisible()) + verticalScroll = parent->verticalScrollBar(); + } + } + } + int verticalStep = verticalScroll->pageStep(); int horizontalStep = horizontalScroll->pageStep(); if (d->autoScrollCount < qMax(verticalStep, horizontalStep)) |