X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/419ad21309a69e5047624c09941c5d99d0be93c0..abb6807645598e8117e98bbf232cd9cd90fe019a:/src/tooltips/tooltipmanager.cpp

diff --git a/src/tooltips/tooltipmanager.cpp b/src/tooltips/tooltipmanager.cpp
index b647241bf..fbb36aaf5 100644
--- a/src/tooltips/tooltipmanager.cpp
+++ b/src/tooltips/tooltipmanager.cpp
@@ -50,11 +50,9 @@ ToolTipManager::ToolTipManager(QAbstractItemView* parent,
     m_waitOnPreviewTimer(0),
     m_item(),
     m_itemRect(),
-    m_preview(false),
     m_generatingPreview(false),
-    m_previewIsLate(false),
-    m_previewPass(0),
-    m_pix()
+    m_hasDefaultIcon(false),
+    m_previewPixmap()
 {
     KToolTip::setToolTipDelegate(g_delegate);
 
@@ -88,6 +86,7 @@ ToolTipManager::ToolTipManager(QAbstractItemView* parent,
             this, SLOT(hideTip()));
 
     m_view->viewport()->installEventFilter(this);
+    m_view->installEventFilter(this);
 }
 
 ToolTipManager::~ToolTipManager()
@@ -101,7 +100,16 @@ void ToolTipManager::hideTip()
 
 bool ToolTipManager::eventFilter(QObject* watched, QEvent* event)
 {
-    if ((watched == m_view->viewport()) && (event->type() == QEvent::Leave)) {
+    if (watched == m_view->viewport()) {
+        switch (event->type()) {
+        case QEvent::Leave:
+        case QEvent::MouseButtonPress:
+            hideToolTip();
+            break;
+        default:
+            break;
+        }
+    } else if ((watched == m_view) && (event->type() == QEvent::KeyPress)) {
         hideToolTip();
     }
 
@@ -126,9 +134,8 @@ void ToolTipManager::requestToolTip(const QModelIndex& index)
         // only start the previewJob when the mouse has been over this item for 200 milliseconds,
         // this prevents a lot of useless preview jobs when passing rapidly over a lot of items
         m_previewTimer->start(200);
-        m_preview = false;
-        m_previewIsLate = false;
-        m_previewPass = 0;
+        m_previewPixmap = QPixmap();
+        m_hasDefaultIcon = false;
 
         m_timer->start(500);
     } else {
@@ -141,44 +148,22 @@ void ToolTipManager::hideToolTip()
     m_timer->stop();
     m_previewTimer->stop();
     m_waitOnPreviewTimer->stop();
-    m_previewIsLate = false;
     KToolTip::hideTip();
 }
 
 void ToolTipManager::prepareToolTip()
 {
     if (m_generatingPreview) {
-        if (m_previewPass == 1) {
-            // We waited 250msec and the preview is still not finished,
-            // so show the toolTip with a transparent image of maximal width.
-            QPixmap paddedImage(QSize(PREVIEW_WIDTH, 32));
-            m_previewIsLate = true;
-            paddedImage.fill(Qt::transparent);
-            showToolTip(paddedImage, m_item.getToolTipText());
-        }
-
-        ++m_previewPass;
         m_waitOnPreviewTimer->start(250);
-    } else {
-        // The preview generation has finished, find out under which circumstances.
-        if (m_preview && m_previewIsLate) {
-            // We got a preview, but it is late, the tooltip has already been shown.
-            // So update the tooltip directly.
-            showToolTip(m_pix, m_item.getToolTipText());
-            return;
-        }
-
-        KIcon icon;
-        if (m_preview) {
-            // We got a preview.
-            icon = KIcon(m_pix);
-        } else {
-            // No preview, so use an icon.
-            // Force a 128x128 icon, a 256x256 one is far too big.
-            icon = KIcon(KIcon(m_item.iconName()).pixmap(ICON_WIDTH, ICON_HEIGHT));
-        }
+    }
 
-        showToolTip(icon, m_item.getToolTipText());
+    const QString text = m_item.getToolTipText();
+    if (!m_previewPixmap.isNull()) {
+        showToolTip(KIcon(m_previewPixmap), text);
+    } else if (!m_hasDefaultIcon) {
+        const QPixmap image(KIcon(m_item.iconName()).pixmap(ICON_WIDTH, ICON_HEIGHT));
+        showToolTip(image, text);
+        m_hasDefaultIcon = true;
     }
 }
 
@@ -188,7 +173,7 @@ void ToolTipManager::showToolTip(const QIcon& icon, const QString& text)
         return;
     }
 
-    KToolTipItem* tip = new KToolTipItem(icon, m_item.getToolTipText());
+    KToolTipItem* tip = new KToolTipItem(icon, text);
 
     KStyleOptionToolTip option;
     // TODO: get option content from KToolTip or add KToolTip::sizeHint() method
@@ -201,15 +186,7 @@ void ToolTipManager::showToolTip(const QIcon& icon, const QString& text)
     option.state          = QStyle::State_None;
     option.decorationSize = QSize(32, 32);
 
-    QSize size;
-    if (m_previewIsLate) {
-        QPixmap paddedImage(QSize(PREVIEW_WIDTH, PREVIEW_HEIGHT));
-        KToolTipItem maxiTip(paddedImage, m_item.getToolTipText());
-        size = g_delegate->sizeHint(option, maxiTip);
-    }
-    else if (tip != 0) {
-        size = g_delegate->sizeHint(option, *tip);
-    }
+    const QSize size = g_delegate->sizeHint(option, *tip);
     const QRect desktop = QApplication::desktop()->screenGeometry(m_itemRect.bottomRight());
 
     // m_itemRect defines the area of the item, where the tooltip should be
@@ -260,7 +237,7 @@ void ToolTipManager::startPreviewJob()
     connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
             this, SLOT(setPreviewPix(const KFileItem&, const QPixmap&)));
     connect(job, SIGNAL(failed(const KFileItem&)),
-            this, SLOT(previewFailed(const KFileItem&)));
+            this, SLOT(previewFailed()));
 }
 
 
@@ -268,27 +245,16 @@ void ToolTipManager::setPreviewPix(const KFileItem& item,
                                    const QPixmap& pixmap)
 {
     if ((m_item.url() != item.url()) || pixmap.isNull()) {
-        m_generatingPreview = false;
-        return;
-    }
-
-    if (m_previewIsLate) {
-        // always use the maximal width
-        QPixmap paddedImage(QSize(PREVIEW_WIDTH, pixmap.height()));
-        paddedImage.fill(Qt::transparent);
-        QPainter painter(&paddedImage);
-        painter.drawPixmap((PREVIEW_WIDTH - pixmap.width()) / 2, 0, pixmap);
-        m_pix = paddedImage;
+        // an old preview or an invalid preview has been received
+        previewFailed();
     } else {
-        m_pix = pixmap;
+        m_previewPixmap = pixmap;
+        m_generatingPreview = false;
     }
-    m_preview = true;
-    m_generatingPreview = false;
 }
 
-void ToolTipManager::previewFailed(const KFileItem& item)
+void ToolTipManager::previewFailed()
 {
-    Q_UNUSED(item);
     m_generatingPreview = false;
 }