From 0bcb24502e07e69fe201d7f122bc9f9d3b69ee07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 28 Jan 2018 02:04:47 +0100 Subject: GH-2119 Update group view scrollbar when the size of rows doesn't change Previously, it would only update when you resize the window horizontally enough to change the number of icons that fit in a row. --- application/groupview/GroupView.cpp | 65 ++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 29 deletions(-) (limited to 'application/groupview/GroupView.cpp') diff --git a/application/groupview/GroupView.cpp b/application/groupview/GroupView.cpp index 6178db0b..74908f88 100644 --- a/application/groupview/GroupView.cpp +++ b/application/groupview/GroupView.cpp @@ -104,37 +104,9 @@ inline bool operator<(const LocaleString &lhs, const LocaleString &rhs) return (QString::localeAwareCompare(lhs, rhs) < 0); } -void GroupView::updateGeometries() +void GroupView::updateScrollbar() { - geometryCache.clear(); int previousScroll = verticalScrollBar()->value(); - - QMap cats; - - for (int i = 0; i < model()->rowCount(); ++i) - { - const QString groupName = model()->index(i, 0).data(GroupViewRoles::GroupRole).toString(); - if (!cats.contains(groupName)) - { - VisualGroup *old = this->category(groupName); - if (old) - { - auto cat = new VisualGroup(old); - cats.insert(groupName, cat); - cat->update(); - } - else - { - auto cat = new VisualGroup(groupName, this); - cats.insert(groupName, cat); - cat->update(); - } - } - } - - qDeleteAll(m_groups); - m_groups = cats.values(); - if (m_groups.isEmpty()) { verticalScrollBar()->setRange(0, 0); @@ -167,7 +139,38 @@ void GroupView::updateGeometries() } verticalScrollBar()->setValue(qMin(previousScroll, verticalScrollBar()->maximum())); +} + +void GroupView::updateGeometries() +{ + geometryCache.clear(); + + QMap cats; + for (int i = 0; i < model()->rowCount(); ++i) + { + const QString groupName = model()->index(i, 0).data(GroupViewRoles::GroupRole).toString(); + if (!cats.contains(groupName)) + { + VisualGroup *old = this->category(groupName); + if (old) + { + auto cat = new VisualGroup(old); + cats.insert(groupName, cat); + cat->update(); + } + else + { + auto cat = new VisualGroup(groupName, this); + cats.insert(groupName, cat); + cat->update(); + } + } + } + + qDeleteAll(m_groups); + m_groups = cats.values(); + updateScrollbar(); viewport()->update(); } @@ -511,6 +514,10 @@ void GroupView::resizeEvent(QResizeEvent *event) m_currentItemsPerRow = newItemsPerRow; updateGeometries(); } + else + { + updateScrollbar(); + } } void GroupView::dragEnterEvent(QDragEnterEvent *event) -- cgit v1.2.3