Hello community, here is the log from the commit of package kitemviews for openSUSE:Factory checked in at 2015-04-13 20:28:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemviews (Old) and /work/SRC/openSUSE:Factory/.kitemviews.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemviews" Changes: -------- --- /work/SRC/openSUSE:Factory/kitemviews/kitemviews.changes 2015-03-16 09:36:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kitemviews.new/kitemviews.changes 2015-04-13 20:28:34.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Apr 4 14:41:06 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.9.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.9.0.php + +------------------------------------------------------------------- Old: ---- kitemviews-5.8.0.tar.xz New: ---- kitemviews-5.9.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemviews.spec ++++++ --- /var/tmp/diff_new_pack.zAr641/_old 2015-04-13 20:28:34.000000000 +0200 +++ /var/tmp/diff_new_pack.zAr641/_new 2015-04-13 20:28:34.000000000 +0200 @@ -16,16 +16,19 @@ # +%bcond_without lang %define lname libKF5ItemViews5 -%define _tar_path 5.8 +%define _tar_path 5.9 Name: kitemviews -Version: %{_tar_path}.0 +Version: 5.9.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.8.0 +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes BuildRequires: kf5-filesystem +%if %{with lang} BuildRequires: libqt5-linguist-devel >= 5.2.0 +%endif BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 Summary: Set of item views extending the Qt model-view framework @@ -44,7 +47,9 @@ %package -n %lname Summary: Set of item views extending the Qt model-view framework Group: System/GUI/KDE +%if %{with lang} Recommends: %lname-lang = %{version} +%endif %requires_ge libQt5Widgets5 %description -n %lname @@ -74,15 +79,19 @@ %install %kf5_makeinstall -C build - %fdupes %{buildroot}%{_kf5_sharedir} + %fdupes %{buildroot} - %find_lang %{name}5 --with-qt --without-mo +%if %{with lang} +%find_lang %{name}5 --with-qt --without-mo +%endif %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig +%if %{with lang} %files -n %lname-lang -f %{name}5.lang +%endif %files -n %lname %defattr(-,root,root) ++++++ kitemviews-5.8.0.tar.xz -> kitemviews-5.9.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.8.0/CMakeLists.txt new/kitemviews-5.9.0/CMakeLists.txt --- old/kitemviews-5.8.0/CMakeLists.txt 2015-03-07 15:45:56.000000000 +0100 +++ new/kitemviews-5.9.0/CMakeLists.txt 2015-04-04 14:08:36.000000000 +0200 @@ -2,7 +2,7 @@ project(KItemViews) -find_package(ECM 1.8.0 REQUIRED NO_MODULE) +find_package(ECM 5.9.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) set(REQUIRED_QT_VERSION "5.2.0") @@ -18,7 +18,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.8.0") # handled by release scripts +set(KF5_VERSION "5.9.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KITEMVIEWS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kitemviews_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ItemViewsConfigVersion.cmake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.8.0/po/fr/kitemviews5_qt.po new/kitemviews-5.9.0/po/fr/kitemviews5_qt.po --- old/kitemviews-5.8.0/po/fr/kitemviews5_qt.po 2015-03-07 15:45:56.000000000 +0100 +++ new/kitemviews-5.9.0/po/fr/kitemviews5_qt.po 2015-04-04 14:08:36.000000000 +0200 @@ -24,10 +24,10 @@ "PO-Revision-Date: 2014-03-16 18:32+0100\n" "Last-Translator: Sebastien Renard <ren...@kde.org>\n" "Language-Team: French <kde-francoph...@kde.org>\n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" "X-Environment: kde\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemviews-5.8.0/src/kcategorizedview.cpp new/kitemviews-5.9.0/src/kcategorizedview.cpp --- old/kitemviews-5.8.0/src/kcategorizedview.cpp 2015-03-07 15:45:56.000000000 +0100 +++ new/kitemviews-5.9.0/src/kcategorizedview.cpp 2015-04-04 14:08:36.000000000 +0200 @@ -724,16 +724,7 @@ while (bottom <= top) { const int middle = (bottom + top) / 2; const QModelIndex index = d->proxyModel->index(middle, modelColumn(), rootIndex()); - QRect rect = visualRect(index); - const int verticalOff = verticalOffset(); - int horizontalOff = horizontalOffset(); - if (layoutDirection() == Qt::RightToLeft) { - horizontalOff *= -1; - } - rect.topLeft().ry() += verticalOff; - rect.topLeft().rx() += horizontalOff; - rect.bottomRight().ry() += verticalOff; - rect.bottomRight().rx() += horizontalOff; + const QRect rect = visualRect(index); if (rect.contains(point)) { if (index.model()->flags(index) & Qt::ItemIsEnabled) { return index; @@ -742,15 +733,41 @@ } bool directionCondition; if (layoutDirection() == Qt::LeftToRight) { - directionCondition = point.x() > rect.bottomRight().x(); + directionCondition = point.x() >= rect.bottomLeft().x(); } else { - directionCondition = point.x() < rect.bottomLeft().x(); + directionCondition = point.x() <= rect.bottomRight().x(); } - if (point.y() > rect.bottomRight().y() || - (point.y() > rect.topLeft().y() && point.y() < rect.bottomRight().y() && directionCondition)) { + if (point.y() < rect.topLeft().y()) { + top = middle - 1; + } else if (directionCondition) { bottom = middle + 1; - } else { + } else if (point.y() <= rect.bottomRight().y()) { top = middle - 1; + } else { + bool after = true; + for (int i = middle - 1;i >= bottom;i--) { + const QModelIndex newIndex = + d->proxyModel->index(i, modelColumn(), rootIndex()); + const QRect newRect = visualRect(newIndex); + if (newRect.topLeft().y() < rect.topLeft().y()) { + break; + } else if (newRect.contains(point)) { + if (newIndex.model()->flags(newIndex) & Qt::ItemIsEnabled) { + return newIndex; + } + return QModelIndex(); + } else if ((layoutDirection() == Qt::LeftToRight) ? + (newRect.topLeft().x() <= point.x()) : + (newRect.topRight().x() >= point.x())) { + break; + } else if (newRect.bottomRight().y() >= point.y()) { + after = false; + } + } + if (!after) { + return QModelIndex(); + } + bottom = middle + 1; } } return QModelIndex();
