Fix the problem "the scrollbar remains if it was shown on the

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 057916906089726f3175d7e5c4a3f8cc8b38c90e..f3758ce25675947ad2b07d8f820deca1136105f2 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -28,10 +28,10 @@
 #include <QTimer>
 #include <QScrollBar>
 
+#include <kcolorscheme.h>
 #include <kdirmodel.h>
 #include <kdirlister.h>
 #include <kfileitemdelegate.h>
-#include <kglobalsettings.h>
 #include <klocale.h>
 #include <kiconeffect.h>
 #include <kio/netaccess.h>
@@ -89,8 +89,8 @@ DolphinView::DolphinView(QWidget* parent,
 
     m_controller = new DolphinController(this);
     m_controller->setUrl(url);
-    connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)),
-            this, SLOT(openContextMenu(const QPoint&)));
+    connect(m_controller, SIGNAL(requestContextMenu(const QPoint&, const KUrl&)),
+            this, SLOT(openContextMenu(const QPoint&, const KUrl&)));
     connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const QModelIndex&, QWidget*)),
             this, SLOT(dropUrls(const KUrl::List&, const QModelIndex&, QWidget*)));
     connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)),
@@ -132,7 +132,7 @@ void DolphinView::setActive(bool active)
 
     m_active = active;
 
-    QColor color = KGlobalSettings::baseColor();
+    QColor color = KColorScheme(KColorScheme::View).background();
     if (active) {
         emit urlChanged(url());
         emit selectionChanged(selectedItems());
@@ -697,7 +697,7 @@ void DolphinView::changeSelection(const KFileItemList& selection)
                                          | QItemSelectionModel::Current);
 }
 
-void DolphinView::openContextMenu(const QPoint& pos)
+void DolphinView::openContextMenu(const QPoint& pos, const KUrl& url)
 {
     KFileItem* item = 0;
 
@@ -706,7 +706,7 @@ void DolphinView::openContextMenu(const QPoint& pos)
         item = fileItem(index);
     }
 
-    emit requestContextMenu(item, url());
+    emit requestContextMenu(item, url);
 }
 
 void DolphinView::dropUrls(const KUrl::List& urls,