X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/148282e2d856b47ceb191eeef4c834118c8cdffd..ed0df8dc1fc9576e36c920882e7f4b00a2811113:/src/dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index b95de351a..4c7e9180f 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -21,7 +21,7 @@
 
 #include "dolphincategorydrawer.h"
 #include "dolphincontroller.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinviewautoscroller.h"
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_generalsettings.h"
@@ -40,9 +40,9 @@
 
 DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) :
     KCategorizedView(parent),
-    m_enableScrollTo(false),
     m_controller(controller),
     m_selectionManager(0),
+    m_autoScroller(0),
     m_categoryDrawer(0),
     m_font(),
     m_decorationSize(),
@@ -55,14 +55,13 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
     setLayoutDirection(Qt::LeftToRight);
     setViewMode(QListView::IconMode);
     setResizeMode(QListView::Adjust);
-    setSpacing(KDialog::spacingHint());
     setMovement(QListView::Static);
     setDragEnabled(true);
     setEditTriggers(QAbstractItemView::NoEditTriggers);
     viewport()->setAcceptDrops(true);
 
     setMouseTracking(true);
-    new DolphinViewAutoScroller(this);
+    m_autoScroller = new DolphinViewAutoScroller(this);
 
     connect(this, SIGNAL(clicked(const QModelIndex&)),
             controller, SLOT(requestTab(const QModelIndex&)));
@@ -126,8 +125,8 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
 
     setFocus();
 
-    connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
-            this, SLOT(updateFont()));
+    connect(KGlobalSettings::self(), SIGNAL(settingsChanged(int)),
+            this, SLOT(slotGlobalSettingsChanged(int)));
 }
 
 DolphinIconsView::~DolphinIconsView()
@@ -136,19 +135,6 @@ DolphinIconsView::~DolphinIconsView()
     m_categoryDrawer = 0;
 }
 
-void DolphinIconsView::scrollTo(const QModelIndex& index, ScrollHint hint)
-{
-    // Enable the QListView implementation of scrollTo() only if it has been
-    // triggered by a key press. Otherwise QAbstractItemView wants to scroll to the current
-    // index each time the layout has been changed. This becomes an issue when
-    // previews are loaded and the scrollbar is used: the scrollbar will always
-    // be reset to 0 on each new preview.
-    if (m_enableScrollTo || (state() != QAbstractItemView::NoState)) {
-        KCategorizedView::scrollTo(index, hint);
-        m_enableScrollTo = false;
-    }
-}
-
 void DolphinIconsView::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
     KCategorizedView::dataChanged(topLeft, bottomRight);
@@ -263,7 +249,6 @@ void DolphinIconsView::keyPressEvent(QKeyEvent* event)
 {
     KCategorizedView::keyPressEvent(event);
     m_controller->handleKeyPressEvent(event);
-    m_enableScrollTo = true; // see DolphinIconsView::scrollTo()
 }
 
 void DolphinIconsView::wheelEvent(QWheelEvent* event)
@@ -277,10 +262,10 @@ void DolphinIconsView::wheelEvent(QWheelEvent* event)
         event->ignore();
         return;
     }
-    
+
     horizontalScrollBar()->setSingleStep(m_itemSize.width() / 10);
     verticalScrollBar()->setSingleStep(m_itemSize.height() / 10);
-    
+
     KCategorizedView::wheelEvent(event);
     // if the icons are aligned left to right, the vertical wheel event should
     // be applied to the horizontal scrollbar
@@ -314,6 +299,21 @@ void DolphinIconsView::leaveEvent(QEvent* event)
     m_controller->emitViewportEntered();
 }
 
+void DolphinIconsView::currentChanged(const QModelIndex& current, const QModelIndex& previous)
+{
+    KCategorizedView::currentChanged(current, previous);
+    if (current.isValid() && !m_autoScroller->isActive()) {
+        scrollTo(current);
+    }
+}
+
+void DolphinIconsView::resizeEvent(QResizeEvent* event)
+{
+    KCategorizedView::resizeEvent(event);
+    const DolphinView* view = m_controller->dolphinView();
+    updateGridSize(view->showPreview(), view->additionalInfo().count());
+}
+
 void DolphinIconsView::slotShowPreviewChanged()
 {
     const DolphinView* view = m_controller->dolphinView();
@@ -356,14 +356,23 @@ void DolphinIconsView::requestActivation()
     m_controller->requestActivation();
 }
 
-void DolphinIconsView::updateFont()
+void DolphinIconsView::slotGlobalSettingsChanged(int category)
 {
+    Q_UNUSED(category);
+
     const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     Q_ASSERT(settings != 0);
-
     if (settings->useSystemFont()) {
         m_font = KGlobalSettings::generalFont();
     }
+
+    disconnect(this, SIGNAL(clicked(QModelIndex)), m_controller, SLOT(triggerItem(QModelIndex)));
+    disconnect(this, SIGNAL(doubleClicked(QModelIndex)), m_controller, SLOT(triggerItem(QModelIndex)));
+    if (KGlobalSettings::singleClick()) {
+        connect(this, SIGNAL(clicked(QModelIndex)), m_controller, SLOT(triggerItem(QModelIndex)));
+    } else {
+        connect(this, SIGNAL(doubleClicked(QModelIndex)), m_controller, SLOT(triggerItem(QModelIndex)));
+    }
 }
 
 void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount)
@@ -387,20 +396,46 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount)
     Q_ASSERT(additionalInfoCount >= 0);
     itemHeight += additionalInfoCount * m_font.pointSize() * 2;
 
+    // Optimize the item size of the grid in a way to prevent large gaps on the
+    // right border (= row arrangement) or the bottom border (= column arrangement).
+    // There is no public API in QListView to find out the used width of the viewport
+    // for the layout. The following calculation of 'contentWidth'/'contentHeight'
+    // is based on QListViewPrivate::prepareItemsLayout() (Copyright (C) 2009 Nokia Corporation).
+    int frameAroundContents = 0;
+    if (style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents)) {
+        frameAroundContents = style()->pixelMetric(QStyle::PM_DefaultFrameWidth) * 2;
+    }
+    const int spacing = settings->gridSpacing();
     if (settings->arrangement() == QListView::TopToBottom) {
+        const int contentWidth = viewport()->width() - 1
+                                 - frameAroundContents
+                                 - style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, horizontalScrollBar());
+        const int gridWidth = itemWidth + spacing * 2;
+        const int horizItemCount = contentWidth / gridWidth;
+        if (horizItemCount > 0) {
+            itemWidth += (contentWidth - horizItemCount * gridWidth) / horizItemCount;
+        }
+
         // The decoration width indirectly defines the maximum
         // width for the text wrapping. To use the maximum item width
         // for text wrapping, it is used as decoration width.
         m_decorationSize = QSize(itemWidth, size);
         setIconSize(QSize(itemWidth, size));
     } else {
+        const int contentHeight = viewport()->height() - 1
+                                  - frameAroundContents
+                                  - style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, verticalScrollBar());
+        const int gridHeight = itemHeight + spacing;
+        const int vertItemCount = contentHeight / gridHeight;
+        if (vertItemCount > 0) {
+            itemHeight += (contentHeight - vertItemCount * gridHeight) / vertItemCount;
+        }
+
         m_decorationSize = QSize(size, size);
         setIconSize(QSize(size, size));
     }
 
     m_itemSize = QSize(itemWidth, itemHeight);
-
-    const int spacing = settings->gridSpacing();
     setGridSize(QSize(itemWidth + spacing * 2, itemHeight + spacing));
 
     KFileItemDelegate* delegate = dynamic_cast<KFileItemDelegate*>(itemDelegate());