Treeview fixes (backport):

[dolphin.git] / src / dolphincolumnview.cpp

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index d6bd08a422f027059753d8aa42ccf53fba3149fd..bfbc5d9f135e3fab954cc17416a5b4023361a3a6 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -19,25 +19,14 @@
 
 #include "dolphincolumnview.h"
 
-#include "dolphinmodel.h"
 #include "dolphincolumnwidget.h"
 #include "dolphincontroller.h"
-#include "dolphindirlister.h"
-#include "dolphinmodel.h"
-#include "dolphinsortfilterproxymodel.h"
 #include "dolphinsettings.h"
 
 #include "dolphin_columnmodesettings.h"
 
-#include <kcolorutils.h>
-#include <kcolorscheme.h>
-#include <kdirlister.h>
-
-#include <QAbstractProxyModel>
-#include <QApplication>
 #include <QPoint>
 #include <QScrollBar>
-#include <QTimer>
 #include <QTimeLine>
 
 DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* controller) :
@@ -341,6 +330,7 @@ void DolphinColumnView::resizeEvent(QResizeEvent* event)
 {
     QAbstractItemView::resizeEvent(event);
     layoutColumns();
+    updateScrollBar();
     assureVisibleActiveColumn();
 }
 
@@ -513,7 +503,8 @@ void DolphinColumnView::assureVisibleActiveColumn()
         } else {
             m_animation->setFrameRange(-m_contentX, -newContentX);
         }
-        m_animation->start();
+        if(m_animation->state() != QTimeLine::Running)
+           m_animation->start();
     } else if (x < 0) {
         const int newContentX = m_contentX - x;
         if (isRightToLeft()) {
@@ -521,7 +512,8 @@ void DolphinColumnView::assureVisibleActiveColumn()
         } else {
             m_animation->setFrameRange(-m_contentX, -newContentX);
         }
-        m_animation->start();
+        if(m_animation->state() != QTimeLine::Running)
+           m_animation->start();
     }
 }
 
@@ -554,19 +546,4 @@ void DolphinColumnView::removeAllColumns()
     assureVisibleActiveColumn();
 }
 
-void DolphinColumnView::setModel ( QAbstractItemModel * model )
-{
-    QAbstractItemView::setModel(model);
-    if(m_columns[0]) {
-       m_columns[0]->setModel(model);
-        m_columns[0]->setSelectionModel(selectionModel());
-    }
-}
-void DolphinColumnView::setSelectionModel ( QItemSelectionModel * selectionModel )
-{
-    if(m_columns[0])
-        m_columns[0]->setSelectionModel(selectionModel);
-    QAbstractItemView::setSelectionModel(selectionModel);
-}
-
 #include "dolphincolumnview.moc"