X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/452e2edaecc4a8ab062ee18e7c3c508eb2c909fb..51bd6cfdfad4d1be706f6dc125762889c19fcc5a:/src/views/dolphinitemlistcontainer.cpp

diff --git a/src/views/dolphinitemlistcontainer.cpp b/src/views/dolphinitemlistcontainer.cpp
index 38adfde64..ec1af9549 100644
--- a/src/views/dolphinitemlistcontainer.cpp
+++ b/src/views/dolphinitemlistcontainer.cpp
@@ -59,10 +59,8 @@ DolphinItemListContainer::DolphinItemListContainer(KDirLister* dirLister,
 
 DolphinItemListContainer::~DolphinItemListContainer()
 {
-    IconsModeSettings::self()->writeConfig();
-    CompactModeSettings::self()->writeConfig();
-    DetailsModeSettings::self()->writeConfig();
-
+    writeSettings();
+    
     controller()->setView(0);
     delete m_fileItemListView;
     m_fileItemListView = 0;
@@ -170,7 +168,7 @@ void DolphinItemListContainer::endTransaction()
     m_fileItemListView->endTransaction();
 }
 
-void DolphinItemListContainer::refresh()
+void DolphinItemListContainer::readSettings()
 {
     ViewModeSettings settings(viewMode());
     settings.readConfig();
@@ -192,6 +190,13 @@ void DolphinItemListContainer::refresh()
     endTransaction();
 }
 
+void DolphinItemListContainer::writeSettings()
+{  
+    IconsModeSettings::self()->writeConfig();
+    CompactModeSettings::self()->writeConfig();
+    DetailsModeSettings::self()->writeConfig();
+}
+
 void DolphinItemListContainer::updateGridSize()
 {
     const ViewModeSettings settings(viewMode());
@@ -201,30 +206,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;
-        itemWidth = minItemWidth + IconsModeSettings::textWidthIndex() * 64; // TODO:
-        if (itemWidth < iconSize + innerMargin * 2) {
-            itemWidth = iconSize + innerMargin * 2;
+        const int minItemWidth = 48;
+        itemWidth = minItemWidth + IconsModeSettings::textWidthIndex() * 64;
+        
+        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 * 2;
+        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:
@@ -235,10 +256,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()