diff options
author | James Meyer <james.meyer@operamail.com> | 2011-08-06 02:11:57 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2011-08-06 02:11:57 (GMT) |
commit | 2c376fdb646fce75480d593754129028ec2380ac (patch) | |
tree | 3f7ec59f7176280d11aab06e3311379feed17fb5 /abs/core/qt/fix-scroll-when-last-item-is-removed.patch | |
parent | 9632d9914981c369d0bdc1e486f108f229db7410 (diff) | |
parent | 8bc233d2a285e825733593aff91e9211758fc838 (diff) | |
download | linhes_pkgbuild-2c376fdb646fce75480d593754129028ec2380ac.zip linhes_pkgbuild-2c376fdb646fce75480d593754129028ec2380ac.tar.gz linhes_pkgbuild-2c376fdb646fce75480d593754129028ec2380ac.tar.bz2 |
Merge branch 'testing' of ssh://jams@linhes.org/mount/repository/linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/qt/fix-scroll-when-last-item-is-removed.patch')
-rw-r--r-- | abs/core/qt/fix-scroll-when-last-item-is-removed.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/abs/core/qt/fix-scroll-when-last-item-is-removed.patch b/abs/core/qt/fix-scroll-when-last-item-is-removed.patch deleted file mode 100644 index 8656702..0000000 --- a/abs/core/qt/fix-scroll-when-last-item-is-removed.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6da6b7099d4e0b49329793e4b90703ec3d868048 Mon Sep 17 00:00:00 2001 -From: Frank Reininghaus <frank78ac@googlemail.com> -Date: Wed, 22 Sep 2010 10:19:59 +0200 -Subject: [PATCH] QTreeView: do not scroll to top if last item is removed - -When the last item is the current item and is removed, -QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's -viewItems member is cleared. This commit makes sure that viewItems is -restored by calling QTreeView::doItemsLayout() in this case, preventing -that the scroll bar range is set to zero temporarily and the view is -scrolled to the top unexpectedly (this was a regression in 4.7.0: -QTBUG-13567). - -Merge-request: 2481 -Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> ---- - src/gui/itemviews/qtreeview.cpp | 4 ++++ - tests/auto/qtreeview/tst_qtreeview.cpp | 22 ++++++++++++++++++++++ - 2 files changed, 26 insertions(+), 0 deletions(-) - -diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp -index b797776..40b51fe 100644 ---- a/src/gui/itemviews/qtreeview.cpp -+++ b/src/gui/itemviews/qtreeview.cpp -@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars() - if (!viewportSize.isValid()) - viewportSize = QSize(0, 0); - -+ if (viewItems.isEmpty()) { -+ q->doItemsLayout(); -+ } -+ - int itemsInViewport = 0; - if (uniformRowHeights) { - if (defaultItemHeight <= 0) --- -1.6.1 - |