┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/sidebartreeview.cpp13
-rw-r--r--src/treeviewsidebarpage.cpp8
2 files changed, 7 insertions, 14 deletions
diff --git a/src/sidebartreeview.cpp b/src/sidebartreeview.cpp
index d31300539..9ab10a0b2 100644
--- a/src/sidebartreeview.cpp
+++ b/src/sidebartreeview.cpp
@@ -81,12 +81,10 @@ bool SidebarTreeView::event(QEvent* event)
header()->hide();
}
else if (event->type() == QEvent::UpdateRequest) {
- resizeColumnToContents(DolphinModel::Name);
-
-// TODO: Remove this check when 4.3.2 is released and KDE requires it... this
-// check avoids a division by zero happening on versions before 4.3.1.
-// Right now KDE in theory can be shipped with Qt 4.3.0 and above.
-// ereslibre
+ // TODO: Remove this check when 4.3.2 is released and KDE requires it... this
+ // check avoids a division by zero happening on versions before 4.3.1.
+ // Right now KDE in theory can be shipped with Qt 4.3.0 and above.
+ // ereslibre
#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY))
// a wheel movement will scroll 1 item
if (model()->rowCount() > 0) {
@@ -94,6 +92,9 @@ bool SidebarTreeView::event(QEvent* event)
}
#endif
}
+ else if (event->type() == QEvent::MetaCall) {
+ resizeColumnToContents(DolphinModel::Name);
+ }
return QTreeView::event(event);
}
diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 0b28b97e8..82e2a0507 100644
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -192,8 +192,6 @@ void TreeViewSidebarPage::expandToLeafDir()
QItemSelectionModel* selModel = m_treeView->selectionModel();
selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
-
- m_treeView->resizeColumnToContents(DolphinModel::Name);
}
@@ -203,8 +201,6 @@ void TreeViewSidebarPage::loadSubTree()
selModel->clearSelection();
if (m_leafDir.isParentOf(m_dirLister->url())) {
- m_treeView->resizeColumnToContents(DolphinModel::Name);
-
// The leaf directory is not a child of the base URL, hence
// no sub directory must be loaded or selected.
return;
@@ -222,8 +218,6 @@ void TreeViewSidebarPage::loadSubTree()
// get invoked if the expanding has been finished.
m_dolphinModel->expandToUrl(m_leafDir);
}
-
- m_treeView->resizeColumnToContents(DolphinModel::Name);
}
void TreeViewSidebarPage::loadTree(const KUrl& url)
@@ -246,8 +240,6 @@ void TreeViewSidebarPage::loadTree(const KUrl& url)
} else {
loadSubTree();
}
-
- m_treeView->resizeColumnToContents(DolphinModel::Name);
}
#include "treeviewsidebarpage.moc"