Cleanup and minor fixes for column-handling

[dolphin.git] / src / views / dolphinitemlistcontainer.cpp

diff --git a/src/views/dolphinitemlistcontainer.cpp b/src/views/dolphinitemlistcontainer.cpp
index c687ede4d4a4702393ee542bcc483800806c2547..8224399487c4715e1e0a5042b78965ae59b2aaf1 100644 (file)
--- a/src/views/dolphinitemlistcontainer.cpp
+++ b/src/views/dolphinitemlistcontainer.cpp
@@ -48,7 +48,7 @@ DolphinItemListContainer::DolphinItemListContainer(KDirLister* dirLister,
     controller()->setModel(new KFileItemModel(dirLister, this));
 
     m_fileItemListView = new KFileItemListView();
-    m_fileItemListView->setWidgetCreator(new KItemListWidgetCreator<DolphinFileItemListWidget>());    
+    m_fileItemListView->setWidgetCreator(new KItemListWidgetCreator<DolphinFileItemListWidget>());
     m_fileItemListView->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());
     controller()->setView(m_fileItemListView);
 
@@ -60,7 +60,7 @@ DolphinItemListContainer::DolphinItemListContainer(KDirLister* dirLister,
 DolphinItemListContainer::~DolphinItemListContainer()
 {
     writeSettings();
-    
+
     controller()->setView(0);
     delete m_fileItemListView;
     m_fileItemListView = 0;
@@ -133,15 +133,18 @@ void DolphinItemListContainer::setItemLayout(KFileItemListView::Layout layout)
     switch (layout) {
     case KFileItemListView::IconsLayout:
         m_fileItemListView->setScrollOrientation(Qt::Vertical);
-        m_fileItemListView->setHeaderShown(false);
+        m_fileItemListView->setHeaderVisible(false);
+        m_fileItemListView->setSupportsItemExpanding(false);
         break;
     case KFileItemListView::DetailsLayout:
         m_fileItemListView->setScrollOrientation(Qt::Vertical);
-        m_fileItemListView->setHeaderShown(true);
+        m_fileItemListView->setHeaderVisible(true);
+        m_fileItemListView->setSupportsItemExpanding(DetailsModeSettings::expandableFolders());
         break;
     case KFileItemListView::CompactLayout:
         m_fileItemListView->setScrollOrientation(Qt::Horizontal);
-        m_fileItemListView->setHeaderShown(false);
+        m_fileItemListView->setHeaderVisible(false);
+        m_fileItemListView->setSupportsItemExpanding(false);
         break;
     default:
         Q_ASSERT(false);
@@ -176,6 +179,11 @@ void DolphinItemListContainer::readSettings()
     beginTransaction();
 
     m_fileItemListView->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());
+
+    const bool expandableFolders = (itemLayout() && KFileItemListView::DetailsLayout) &&
+                                   DetailsModeSettings::expandableFolders();
+    m_fileItemListView->setSupportsItemExpanding(expandableFolders);
+
     updateAutoActivationDelay();
     updateFont();
     updateGridSize();
@@ -191,7 +199,7 @@ void DolphinItemListContainer::readSettings()
 }
 
 void DolphinItemListContainer::writeSettings()
-{  
+{
     IconsModeSettings::self()->writeConfig();
     CompactModeSettings::self()->writeConfig();
     DetailsModeSettings::self()->writeConfig();
@@ -206,30 +214,46 @@ void DolphinItemListContainer::updateGridSize()
     m_zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(QSize(iconSize, iconSize));
     KItemListStyleOption styleOption = m_fileItemListView->styleOption();
 
-    const int innerMargin = (iconSize >= KIconLoader::SizeSmallMedium) ? 4 : 2;
+    const int padding = 2;
+    int horizontalMargin = 0;
+    int verticalMargin = 0;
 
     // Calculate the item-width and item-height
     int itemWidth;
     int itemHeight;
     switch (itemLayout()) {
     case KFileItemListView::IconsLayout: {
-        const int minItemWidth = 64;
+        const int minItemWidth = 48;
         itemWidth = minItemWidth + IconsModeSettings::textWidthIndex() * 64;
-        if (itemWidth < iconSize + innerMargin * 2) {
-            itemWidth = iconSize + innerMargin * 2;
+
+        if (previewsShown()) {
+            // Optimize the width for previews with a 3:2 aspect ratio instead
+            // of a 1:1 ratio to avoid wasting too much vertical space when
+            // photos.
+            const int minWidth = iconSize * 3 / 2;
+            itemWidth = qMax(itemWidth, minWidth);
         }
-        itemHeight = innerMargin * 2 + iconSize + styleOption.fontMetrics.height();
+
+        if (itemWidth < iconSize + padding * 2) {
+            itemWidth = iconSize + padding * 2;
+        }
+        itemHeight = padding * 3 + iconSize + styleOption.fontMetrics.height();
+
+        horizontalMargin = 4;
+        verticalMargin = 8;
         break;
     }
     case KFileItemListView::CompactLayout: {
-        itemWidth = innerMargin * 4 + iconSize + styleOption.fontMetrics.height() * 5;
+        itemWidth = padding * 4 + iconSize + styleOption.fontMetrics.height() * 5;
         const int textLinesCount = m_fileItemListView->visibleRoles().count();
-        itemHeight = innerMargin * 2 + qMax(iconSize, textLinesCount * styleOption.fontMetrics.height());
+        itemHeight = padding * 2 + qMax(iconSize, textLinesCount * styleOption.fontMetrics.height());
+
+        horizontalMargin = 8;
         break;
     }
     case KFileItemListView::DetailsLayout: {
         itemWidth = -1;
-        itemHeight = innerMargin * 2 + qMax(iconSize, styleOption.fontMetrics.height());
+        itemHeight = padding * 2 + qMax(iconSize, styleOption.fontMetrics.height());
         break;
     }
     default:
@@ -240,10 +264,14 @@ void DolphinItemListContainer::updateGridSize()
     }
 
     // Apply the calculated values
-    styleOption.margin = innerMargin;
+    styleOption.padding = padding;
+    styleOption.horizontalMargin = horizontalMargin;
+    styleOption.verticalMargin = verticalMargin;
     styleOption.iconSize = iconSize;
+    m_fileItemListView->beginTransaction();
     m_fileItemListView->setStyleOption(styleOption);
     m_fileItemListView->setItemSize(QSizeF(itemWidth, itemHeight));
+    m_fileItemListView->endTransaction();
 }
 
 void DolphinItemListContainer::updateFont()