Hello community,
here is the log from the commit of package yast2-control-center for openSUSE:Factory
checked in at Fri May 6 10:58:39 CEST 2011.
--------
--- yast2-control-center/yast2-control-center.changes 2011-04-27 17:23:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-control-center/yast2-control-center.changes 2011-05-05 15:59:46.000000000 +0200
@@ -1,0 +2,6 @@
+Thu May 5 15:57:43 CEST 2011 - tgoettlicher(a)suse.de
+
+- Fixed module highlighting when window is scrolled (bnc #685446)
+- 2.21.2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-control-center-2.21.1.tar.bz2
New:
----
yast2-control-center-2.21.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.nc53iU/_old 2011-05-06 10:54:54.000000000 +0200
+++ /var/tmp/diff_new_pack.nc53iU/_new 2011-05-06 10:54:54.000000000 +0200
@@ -18,11 +18,11 @@
Name: yast2-control-center
-Version: 2.21.1
+Version: 2.21.2
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-control-center-2.21.1.tar.bz2
+Source0: yast2-control-center-2.21.2.tar.bz2
Group: System/YaST
License: GPLv2+
BuildRequires: libdrm-devel libjpeg-devel libqt4-devel pkgconfig update-desktop-files yast2-devtools
++++++ yast2-control-center-2.21.1.tar.bz2 -> yast2-control-center-2.21.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.21.1/VERSION.cmake new/yast2-control-center-2.21.2/VERSION.cmake
--- old/yast2-control-center-2.21.1/VERSION.cmake 2011-04-27 17:23:09.000000000 +0200
+++ new/yast2-control-center-2.21.2/VERSION.cmake 2011-05-05 15:59:29.000000000 +0200
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "21")
-SET(VERSION_PATCH "1")
+SET(VERSION_PATCH "2")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.21.1/package/yast2-control-center.changes new/yast2-control-center-2.21.2/package/yast2-control-center.changes
--- old/yast2-control-center-2.21.1/package/yast2-control-center.changes 2011-04-27 17:23:09.000000000 +0200
+++ new/yast2-control-center-2.21.2/package/yast2-control-center.changes 2011-05-05 15:59:29.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu May 5 15:57:43 CEST 2011 - tgoettlicher(a)suse.de
+
+- Fixed module highlighting when window is scrolled (bnc #685446)
+- 2.21.2
+
+-------------------------------------------------------------------
Wed Apr 27 17:22:24 CEST 2011 - tgoettlicher(a)suse.de
- Removed useless warning message (bnc #620617)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-control-center-2.21.1/src/kcategorizedview.cpp new/yast2-control-center-2.21.2/src/kcategorizedview.cpp
--- old/yast2-control-center-2.21.1/src/kcategorizedview.cpp 2011-04-27 17:23:09.000000000 +0200
+++ new/yast2-control-center-2.21.2/src/kcategorizedview.cpp 2011-05-05 15:59:29.000000000 +0200
@@ -697,6 +697,8 @@
}
}
+
+
void KCategorizedView::selectCategory( const QString cat )
{
QRect previous = d->categoryVisualRect( d->selectedCategory );
@@ -917,147 +919,6 @@
d->updateScrollbars();
}
-/*void KCategorizedView::setSelection(const QRect &rect,
- QItemSelectionModel::SelectionFlags flags)
-{
- if (!d->proxyModel || !d->categoryDrawer || !d->proxyModel->isCategorizedModel())
- {
- QListView::setSelection(rect, flags);
- return;
- }
-
- if (!flags)
- return;
-
- if (flags & QItemSelectionModel::Clear)
- {
- selectionModel()->clear();
- d->lastSelection.clear();
- }
-
- QModelIndexList dirtyIndexes = d->intersectionSet(rect);
-
- // no items affected, just leave
- if (!dirtyIndexes.count())
- {
- selectionModel()->select(d->lastSelection, QItemSelectionModel::SelectCurrent);
-
- return;
- }
-
- QModelIndex topLeft;
- QModelIndex bottomRight;
-
- if (d->mouseButtonPressed || d->rightMouseButtonPressed) // selection with click + drag
- {
- QItemSelection selection;
-
- QModelIndex prev = dirtyIndexes[0];
- QModelIndex first = prev;
- foreach (const QModelIndex &index, dirtyIndexes)
- {
- // we have a different interval. non-contiguous items
- if ((index.row() - prev.row()) > 1) {
- selection << QItemSelectionRange(first, prev);
-
- first = index;
- }
-
- prev = index;
- }
-
- selection << QItemSelectionRange(first, prev);
-
- if (flags & QItemSelectionModel::Current)
- {
- if (rect.topLeft() == rect.bottomRight())
- {
- selectionModel()->setCurrentIndex(indexAt(rect.topLeft()), QItemSelectionModel::NoUpdate);
- }
-
- selection.merge(d->lastSelection, flags);
- }
- else
- {
- selection.merge(selectionModel()->selection(), flags);
-
- selectionModel()->select(selection, QItemSelectionModel::SelectCurrent);
-
- return;
- }
-
- selectionModel()->select(selection, flags);
- }
- else // selection with click + keyboard keys
- {
- QModelIndex topLeftIndex = indexAt(QPoint(rect.topLeft().x(),
- rect.topLeft().y()));
- QModelIndex bottomRightIndex = indexAt(QPoint(rect.bottomRight().x(),
- rect.bottomRight().y()));
-
- // keyboard selection comes "upside down". Let's normalize it
- if (topLeftIndex.row() > bottomRightIndex.row())
- {
- QModelIndex auxIndex = topLeftIndex;
- topLeftIndex = bottomRightIndex;
- bottomRightIndex = auxIndex;
- }
-
- int viewportWidth = viewport()->width() - spacing();
- int itemWidth;
-
- if (gridSize().isEmpty())
- {
- itemWidth = d->biggestItemSize.width();
- }
- else
- {
- itemWidth = gridSize().width();
- }
-
- int itemWidthPlusSeparation = spacing() + itemWidth;
- if (!itemWidthPlusSeparation)
- itemWidthPlusSeparation++;
- int elementsPerRow = viewportWidth / itemWidthPlusSeparation;
- if (!elementsPerRow)
- elementsPerRow++;
-
- QModelIndexList theoricDirty(dirtyIndexes);
- dirtyIndexes.clear();
- int first = model()->rowCount();
- int last = 0;
-
- foreach (const QModelIndex &index, theoricDirty)
- {
- if ((index.row() < first) &&
- ((((topLeftIndex.row() / elementsPerRow) == (index.row() / elementsPerRow)) &&
- ((topLeftIndex.row() % elementsPerRow) <= (index.row() % elementsPerRow))) ||
- (topLeftIndex.row() / elementsPerRow) != (index.row() / elementsPerRow)))
- {
- first = index.row();
- topLeft = index;
- }
-
- if ((index.row() > last) &&
- ((((bottomRightIndex.row() / elementsPerRow) == (index.row() / elementsPerRow)) &&
- ((bottomRightIndex.row() % elementsPerRow) >= (index.row() % elementsPerRow))) ||
- (bottomRightIndex.row() / elementsPerRow) != (index.row() / elementsPerRow)))
- {
- last = index.row();
- bottomRight = index;
- }
- }
-
- for (int i = first; i <= last; i++)
- {
- dirtyIndexes << model()->index(i, theoricDirty[0].column(), theoricDirty[0].parent());
- }
-
- QItemSelection selection(topLeft, bottomRight);
-
- selectionModel()->select(selection, flags);
- }
-}*/
void KCategorizedView::mouseMoveEvent(QMouseEvent *event)
{
@@ -1126,6 +987,7 @@
viewport()->update(rect);
}
+ viewport()->update();
}
void KCategorizedView::mousePressEvent(QMouseEvent *event)
@@ -1178,28 +1040,6 @@
if (/*(selectionMode() != SingleSelection) && (selectionMode() != NoSelection) &&*/
(initialPressPosition == d->initialPressPosition))
{
- /*foreach(const QString &category, d->categories)
- {
- if (d->categoryVisualRect(category).contains(event->pos()) &&
- selectionModel())
- {
- QItemSelection selection; = selectionModel()->selection();
- QModelIndexList indexList = d->categoriesIndexes[category];
-
- foreach (const QModelIndex &index, indexList)
- {
- QModelIndex selectIndex = index.model()->index(index.row(), 0);
- if( d->visualRectInViewport( selectIndex ).contains(initialPressPosition))
- {
- selection << QItemSelectionRange(selectIndex);
- //selectionModel()->select(selection, QItemSelectionModel::SelectCurrent);
- //selectionModel()->setCurrentIndex(selectIndex, QItemSelectionModel::SelectCurrent);
- selectionModel()->select(selectIndex, QItemSelectionModel::SelectCurrent);
- }
- }
-
- //}
- }*/
selectionModel()->select( d->hovered, QItemSelectionModel::SelectCurrent);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
