Forwardport 773570:

[dolphin.git] / src / dolphincolumnwidget.cpp

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 8bf66b2c8874e0eb17acccfbb448b70f19cac9de..c2ba385ad0b635878c18f337c153a3f2fe9fc6ab 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -66,7 +66,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
     setMouseTracking(true);
     viewport()->setAttribute(Qt::WA_Hover);
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+    setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     setSelectionBehavior(SelectItems);
     setSelectionMode(QAbstractItemView::ExtendedSelection);
     setDragDropMode(QAbstractItemView::DragDrop);
@@ -126,7 +126,9 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
         SelectionManager* selManager = new SelectionManager(this);
         connect(selManager, SIGNAL(selectionChanged()),
                 this, SLOT(requestActivation()));
-    }
+        connect(m_view->m_controller, SIGNAL(urlChanged(const KUrl&)),
+                selManager, SLOT(reset()));
+}
     new KMimeTypeResolver(this, m_dolphinModel);
     m_iconManager = new IconManager(this, m_proxyModel);
     m_iconManager->setShowPreview(m_view->m_controller->dolphinView()->showPreview());