4 files changed, 22 insertions, 16 deletions

diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index 5eae792281a..ed90c5f7cf8 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -1644,7 +1644,7 @@ Qt::TextElideMode QAbstractItemView::textElideMode() const
 bool QAbstractItemView::focusNextPrevChild(bool next)
 {
     Q_D(QAbstractItemView);
-    if (d->tabKeyNavigation && isEnabled() && d->viewport->isEnabled()) {
+    if (d->tabKeyNavigation && isVisible() && isEnabled() && d->viewport->isEnabled()) {
         QKeyEvent event(QEvent::KeyPress, next ? Qt::Key_Tab : Qt::Key_Backtab, Qt::NoModifier);
         keyPressEvent(&event);
         if (event.isAccepted())
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index c2e0d52ff5f..4b91b417c1b 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -1560,14 +1560,13 @@ void QHeaderView::setDefaultSectionSize(int size)
     if (size < 0 || size > maxSizeSection)
         return;
     d->setDefaultSectionSize(size);
-    d->customDefaultSectionSize = true;
 }
 
 void QHeaderView::resetDefaultSectionSize()
 {
     Q_D(QHeaderView);
     if (d->customDefaultSectionSize) {
-        d->setDefaultSectionSize(d->getDefaultSectionSizeFromStyle());
+        d->updateDefaultSectionSizeFromStyle();
         d->customDefaultSectionSize = false;
     }
 }
@@ -2415,7 +2414,7 @@ bool QHeaderView::event(QEvent *e)
         break; }
     case QEvent::StyleChange:
         if (!d->customDefaultSectionSize)
-            d->setDefaultSectionSize(d->getDefaultSectionSizeFromStyle());
+            d->updateDefaultSectionSizeFromStyle();
         break;
     default:
         break;
@@ -3882,6 +3881,7 @@ void QHeaderViewPrivate::setDefaultSectionSize(int size)
     executePostedLayout();
     invalidateCachedSizeHint();
     defaultSectionSize = size;
+    customDefaultSectionSize = true;
     if (state == QHeaderViewPrivate::ResizeSection)
         preventCursorChangeInSetOffset = true;
     for (int i = 0; i < sectionItems.size(); ++i) {
@@ -3902,14 +3902,15 @@ void QHeaderViewPrivate::setDefaultSectionSize(int size)
     viewport->update();
 }
 
-int QHeaderViewPrivate::getDefaultSectionSizeFromStyle() const
+void QHeaderViewPrivate::updateDefaultSectionSizeFromStyle()
 {
-    Q_Q(const QHeaderView);
-    return orientation == Qt::Horizontal
-            ? q->style()->pixelMetric(QStyle::PM_HeaderDefaultSectionSizeHorizontal, nullptr, q)
-            : qMax(q->minimumSectionSize(),
-                   q->style()->pixelMetric(QStyle::PM_HeaderDefaultSectionSizeVertical, nullptr,
-                                           q));
+    Q_Q(QHeaderView);
+    if (orientation == Qt::Horizontal) {
+        defaultSectionSize = q->style()->pixelMetric(QStyle::PM_HeaderDefaultSectionSizeHorizontal, nullptr, q);
+    } else {
+        defaultSectionSize = qMax(q->minimumSectionSize(),
+                                  q->style()->pixelMetric(QStyle::PM_HeaderDefaultSectionSizeVertical, nullptr, q));
+    }
 }
 
 void QHeaderViewPrivate::recalcSectionStartPos() const // linear (but fast)
@@ -4218,7 +4219,7 @@ bool QHeaderViewPrivate::read(QDataStream &in)
     if (in.status() == QDataStream::Ok) {  // we haven't read past end
         customDefaultSectionSize = tmpbool;
         if (!customDefaultSectionSize)
-            defaultSectionSize = getDefaultSectionSizeFromStyle();
+            updateDefaultSectionSizeFromStyle();
     }
 
     lastSectionSize = -1;
diff --git a/src/widgets/itemviews/qheaderview_p.h b/src/widgets/itemviews/qheaderview_p.h
index 4b633c21004..42db3708609 100644
--- a/src/widgets/itemviews/qheaderview_p.h
+++ b/src/widgets/itemviews/qheaderview_p.h
@@ -141,7 +141,7 @@ public:
 
     inline void setDefaultValues(Qt::Orientation o) {
         orientation = o;
-        defaultSectionSize = getDefaultSectionSizeFromStyle();
+        updateDefaultSectionSizeFromStyle();
         defaultAlignment = (o == Qt::Horizontal
                             ? Qt::Alignment(Qt::AlignCenter)
                             : Qt::AlignLeft|Qt::AlignVCenter);
@@ -309,7 +309,7 @@ public:
     void removeSectionsFromSectionItems(int start, int end);
     void resizeSectionItem(int visualIndex, int oldSize, int newSize);
     void setDefaultSectionSize(int size);
-    int getDefaultSectionSizeFromStyle() const;
+    void updateDefaultSectionSizeFromStyle();
     void recalcSectionStartPos() const; // not really const
 
     inline int headerLength() const { // for debugging
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index 5835af36a87..714f0bda5a5 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -755,7 +755,10 @@ void QListView::mouseMoveEvent(QMouseEvent *e)
         && d->selectionMode != NoSelection) {
         QRect rect(d->pressedPosition, e->position().toPoint() + QPoint(horizontalOffset(), verticalOffset()));
         rect = rect.normalized();
-        d->viewport->update(d->mapToViewport(rect.united(d->elasticBand)));
+        const int margin = 2 * style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
+        const QRect viewPortRect = rect.united(d->elasticBand)
+                                       .adjusted(-margin, -margin, margin, margin);
+        d->viewport->update(d->mapToViewport(viewPortRect));
         d->elasticBand = rect;
     }
 }
@@ -769,7 +772,9 @@ void QListView::mouseReleaseEvent(QMouseEvent *e)
     QAbstractItemView::mouseReleaseEvent(e);
     // #### move this implementation into a dynamic class
     if (d->showElasticBand && d->elasticBand.isValid()) {
-        d->viewport->update(d->mapToViewport(d->elasticBand));
+        const int margin = 2 * style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
+        const QRect viewPortRect = d->elasticBand.adjusted(-margin, -margin, margin, margin);
+        d->viewport->update(d->mapToViewport(viewPortRect));
         d->elasticBand = QRect();
     }
 }