X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/edf8be2dffa671faabf0fbf6e93b72441f20da5c..70e938b23ef3238bc69ad01ac85cd9262229ea82:/src/dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 1e2e66f5a..2bb21cb79 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -215,17 +215,12 @@ void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event)
     const QModelIndex index = indexAt(event->pos());
     setDirtyRegion(m_dropRect);
 
-    if(!index.isValid()) {
-        m_dropRect.setSize(QSize()); // set as invalid
-    } else {
-        KFileItem item = itemForIndex(index);
-        if (item.isNull()) {
-            kWarning(7007) << "Invalid item returned for index";
-        } else if (itemForIndex(index).isDir()) {
+    m_dropRect.setSize(QSize()); // set as invalid
+    if (index.isValid()) {
+        const KFileItem item = itemForIndex(index);
+        if (!item.isNull() && item.isDir()) {
             m_dropRect = visualRect(index);
-        } else {
-            m_dropRect.setSize(QSize()); // set as invalid
-	}
+        }
     }
     setDirtyRegion(m_dropRect);
 }
@@ -287,12 +282,16 @@ void DolphinIconsView::slotEntered(const QModelIndex& index)
 void DolphinIconsView::slotShowPreviewChanged()
 {
     const DolphinView* view = m_controller->dolphinView();
-    const int infoCount = view->additionalInfo().count();
-    updateGridSize(view->showPreview(), infoCount);
+    updateGridSize(view->showPreview(), additionalInfoCount());
 }
 
 void DolphinIconsView::slotAdditionalInfoChanged(const KFileItemDelegate::InformationList& info)
 {
+    const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+    if (!settings->showAdditionalInfo()) {
+        return;
+    }
+
     const bool showPreview = m_controller->dolphinView()->showPreview();
     updateGridSize(showPreview, info.count());
 }
@@ -323,8 +322,7 @@ void DolphinIconsView::zoomIn()
         settings->setItemWidth(settings->itemWidth() + diff);
         settings->setItemHeight(settings->itemHeight() + diff);
 
-        const int infoCount = m_controller->dolphinView()->additionalInfo().count();
-        updateGridSize(showPreview, infoCount);
+        updateGridSize(showPreview, additionalInfoCount());
     }
 }
 
@@ -355,8 +353,7 @@ void DolphinIconsView::zoomOut()
         settings->setItemWidth(settings->itemWidth() - diff);
         settings->setItemHeight(settings->itemHeight() - diff);
 
-        const int infoCount = m_controller->dolphinView()->additionalInfo().count();
-        updateGridSize(showPreview, infoCount);
+        updateGridSize(showPreview, additionalInfoCount());
     }
 }
 
@@ -452,4 +449,11 @@ KFileItem DolphinIconsView::itemForIndex(const QModelIndex& index) const
     return dirModel->itemForIndex(dirIndex);
 }
 
+int DolphinIconsView::additionalInfoCount() const
+{
+    const DolphinView* view = m_controller->dolphinView();
+    const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+    return settings->showAdditionalInfo() ? view->additionalInfo().count() : 0;
+}
+
 #include "dolphiniconsview.moc"