* Increase the column-width automatically in case where the name of the file does not fit into the available width

* When scrolling to the active column, do it with a small delay so that temporary activations of a column don't result in jittering

BUG: 214324
FIXED-IN: 4.6.0 

svn path=/trunk/KDE/kdebase/apps/; revision=1184290

1 files changed, 13 insertions, 9 deletions

diff --git a/src/views/dolphincolumnviewcontainer.h b/src/views/dolphincolumnviewcontainer.h
index 4b4158cbc..20ae81b38 100644
--- a/src/views/dolphincolumnviewcontainer.h
+++ b/src/views/dolphincolumnviewcontainer.h
@@ -96,15 +96,24 @@ private slots:
      */
     void updateActiveUrl();
 
-private:
-    void layoutColumns();
-
     /**
+     * Invoked when m_assureVisibleActiveColumnTimer has been exceeded.
      * Assures that the currently active column is fully visible
      * by adjusting the horizontal position of the content.
      */
+    void slotAssureVisibleActiveColumn();
+
+private:
+    /**
+     * Assures that the currently active column is fully visible
+     * by adjusting the horizontal position of the content. The
+     * adjustment is done with a small delay (see
+     * slotAssureVisibleActiveColumn();
+     */
     void assureVisibleActiveColumn();
 
+    void layoutColumns();
+
     /**
      * Request the activation for the column \a column. It is assured
      * that the columns gets fully visible by adjusting the horizontal
@@ -116,12 +125,6 @@ private:
     void removeAllColumns();
 
     /**
-     * Returns the position of the point \a point relative to the column
-     * \a column.
-     */
-    QPoint columnPosition(DolphinColumnView* column, const QPoint& point) const;
-
-    /**
      * Deletes the column. If the itemview of the controller is set to the column,
      * the controllers itemview is set to 0.
      */
@@ -139,6 +142,7 @@ private:
     QAbstractItemView* m_dragSource;
 
     QTimer* m_activeUrlTimer;
+    QTimer* m_assureVisibleActiveColumnTimer;
 
     friend class DolphinColumnView;
 };