[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.4/kdelibs
From:       Christoph Feck <christoph () maxiom ! de>
Date:       2010-06-15 21:55:01
Message-ID: 20100615220246.36F12AC8D6 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1138391 by cfeck:

Next attempt at KPluginSelector lockup (backport r1137013)

CCBUG: 213068


 M  +0 -6      kdeui/itemviews/kcategorizedview.cpp  
 M  +1 -0      kutils/kpluginselector.cpp  


--- branches/KDE/4.4/kdelibs/kdeui/itemviews/kcategorizedview.cpp #1138390:1138391
@@ -571,9 +571,6 @@
 
     QListView::setModel(model);
 
-    // check bugs 213068 and 233163 before you enable horizontal scroll bar
-    setHorizontalScrollBarPolicy(d->isCategorized() ? Qt::ScrollBarAlwaysOff : Qt::ScrollBarAsNeeded);
-
     // if the model already had information inserted, update our data structures to it
     if (model->rowCount()) {
         slotLayoutChanged();
@@ -687,9 +684,6 @@
     d->categoryDrawer = categoryDrawer;
     d->categoryDrawerV2 = dynamic_cast<KCategoryDrawerV2*>(categoryDrawer);
 
-    // check bugs 213068 and 233163 before you enable horizontal scroll bar
-    setHorizontalScrollBarPolicy(d->isCategorized() ? Qt::ScrollBarAlwaysOff : Qt::ScrollBarAsNeeded);
-
     if (d->categoryDrawerV2) {
         connect(d->categoryDrawerV2, SIGNAL(collapseOrExpandClicked(QModelIndex)),
                 this, SLOT(_k_slotCollapseOrExpandClicked(QModelIndex)));
--- branches/KDE/4.4/kdelibs/kutils/kpluginselector.cpp #1138390:1138391
@@ -257,6 +257,7 @@
     d->lineEdit->setClickMessage(i18n("Search Plugins"));
     d->listView = new KCategorizedView(this);
     d->listView->setVerticalScrollMode(QListView::ScrollPerPixel);
+    d->listView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); // bug 213068
     d->listView->setAlternatingRowColors(true);
     d->listView->setCategoryDrawer(d->categoryDrawer);
     d->dependenciesWidget = new Private::DependenciesWidget(this);
[prev in list] [next in list] [prev in thread] [next in thread]