summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/widgets/itemviews/qabstractitemview.cpp19
-rw-r--r--src/widgets/itemviews/qheaderview.cpp2
-rw-r--r--tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp10
3 files changed, 26 insertions, 5 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))
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index dc80a4b81f..6326b497c5 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -2333,6 +2333,8 @@ void QHeaderView::mouseMoveEvent(QMouseEvent *e)
return;
}
case QHeaderViewPrivate::MoveSection: {
+ if (d->shouldAutoScroll(e->pos()))
+ d->startAutoScroll();
if (qAbs(pos - d->firstPos) >= QApplication::startDragDistance()
|| !d->sectionIndicator->isHidden()) {
int visual = visualIndexAt(pos);
diff --git a/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp b/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp
index 5a1db1383f..2fc7bbec43 100644
--- a/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp
+++ b/tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp
@@ -97,14 +97,14 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
QTableView tv;
QStandardItemModel m;
- m.setRowCount(10);
- m.setColumnCount(36);
+ m.setRowCount(500);
+ m.setColumnCount(250);
tv.setModel(&m);
SomeHandler handler(tv.horizontalHeader(), &tv);
- tv.horizontalHeader()->setDefaultSectionSize(50);
+ tv.horizontalHeader()->setDefaultSectionSize(30);
+ tv.show();
tv.horizontalHeader()->setSectionsMovable(true);
- tv.showMaximized();
+ tv.verticalHeader()->setSectionsMovable(true);
app.exec();
}
-
#include "qheaderviewtest1.moc"