Tooltip improvements

[dolphin.git] / src / views / tooltips / filemetadatatooltip.cpp

diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp
index f1b09a7475894f59c4e1f7b0e0096acdcf395372..deda38ab6ebaa3ca61bcc9713da78bf2a1db223a 100644 (file)
--- a/src/views/tooltips/filemetadatatooltip.cpp
+++ b/src/views/tooltips/filemetadatatooltip.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2010 by Peter Penz <peter.penz19@gmail.com>             *
  *   Copyright (C) 2008 by Fredrik Höglund <fredrik@kde.org>               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -26,7 +26,8 @@
 #include <KWindowSystem>
 
 #include <QLabel>
-#include <QPainter>
+#include <QStyleOptionFrame>
+#include <QStylePainter>
 #include <QVBoxLayout>
 
 FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
@@ -40,6 +41,7 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
 
     // Create widget for file preview
     m_preview = new QLabel(this);
+    m_preview->setAlignment(Qt::AlignTop);
 
     // Create widget for file name
     m_name = new QLabel(this);
@@ -48,22 +50,27 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
     m_name->setFont(font);
 
     // Create widget for the meta data
-    m_fileMetaDataWidget = new KFileMetaDataWidget();
+    m_fileMetaDataWidget = new KFileMetaDataWidget(this);
     m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
     m_fileMetaDataWidget->setReadOnly(true);
-    connect(m_fileMetaDataWidget, SIGNAL(metaDataRequestFinished()),
-            this, SIGNAL(metaDataRequestFinished()));
+    connect(m_fileMetaDataWidget, SIGNAL(metaDataRequestFinished(KFileItemList)),
+            this, SIGNAL(metaDataRequestFinished(KFileItemList)));
 
     QVBoxLayout* textLayout = new QVBoxLayout();
-    textLayout->setAlignment(Qt::AlignTop);
     textLayout->addWidget(m_name);
     textLayout->addWidget(new KSeparator());
     textLayout->addWidget(m_fileMetaDataWidget);
     textLayout->setAlignment(m_name, Qt::AlignCenter);
     textLayout->setAlignment(m_fileMetaDataWidget, Qt::AlignLeft);
+    // Assure that the text-layout gets top-aligned by adding a stretch.
+    // Don't use textLayout->setAlignment(Qt::AlignTop) instead, as this does
+    // not work with the heightForWidth()-size-hint of m_fileMetaDataWidget
+    // (see bug #241608)
+    textLayout->addStretch();
 
     QHBoxLayout* tipLayout = new QHBoxLayout(this);
     tipLayout->addWidget(m_preview);
+    tipLayout->addSpacing(tipLayout->margin());
     tipLayout->addLayout(textLayout);
 }
 
@@ -78,7 +85,7 @@ void FileMetaDataToolTip::setPreview(const QPixmap& pixmap)
 
 QPixmap FileMetaDataToolTip::preview() const
 {
-    if (m_preview->pixmap() != 0) {
+    if (m_preview->pixmap()) {
         return *m_preview->pixmap();
     }
     return QPixmap();
@@ -106,51 +113,13 @@ KFileItemList FileMetaDataToolTip::items() const
 
 void FileMetaDataToolTip::paintEvent(QPaintEvent* event)
 {
-    Q_UNUSED(event);
+    QStylePainter painter(this);
+    QStyleOptionFrame option;
+    option.init(this);
+    painter.drawPrimitive(QStyle::PE_PanelTipLabel, option);
+    painter.end();
 
-    QPainter painter(this);
-
-    QColor toColor = palette().brush(QPalette::ToolTipBase).color();
-    QColor fromColor = KColorScheme::shade(toColor, KColorScheme::LightShade, 0.2);
-
-    const bool haveAlphaChannel = KWindowSystem::compositingActive();
-    if (haveAlphaChannel) {
-        painter.setRenderHint(QPainter::Antialiasing);
-        painter.translate(0.5, 0.5);
-        toColor.setAlpha(220);
-        fromColor.setAlpha(220);
-    }
-
-    QLinearGradient gradient(QPointF(0.0, 0.0), QPointF(0.0, height()));
-    gradient.setColorAt(0.0, fromColor);
-    gradient.setColorAt(1.0, toColor);
-    painter.setPen(Qt::NoPen);
-    painter.setBrush(gradient);
-
-    const QRect rect(0, 0, width(), height());
-    if (haveAlphaChannel) {
-        const qreal radius = 5.0;
-
-        QPainterPath path;
-        path.moveTo(rect.left(), rect.top() + radius);
-        arc(path, rect.left()  + radius, rect.top()    + radius, radius, 180, -90);
-        arc(path, rect.right() - radius, rect.top()    + radius, radius,  90, -90);
-        arc(path, rect.right() - radius, rect.bottom() - radius, radius,   0, -90);
-        arc(path, rect.left()  + radius, rect.bottom() - radius, radius, 270, -90);
-        path.closeSubpath();
-
-        painter.drawPath(path);
-    } else {
-        painter.drawRect(rect);
-    }
-}
-
-void FileMetaDataToolTip::arc(QPainterPath& path,
-                              qreal cx, qreal cy,
-                              qreal radius, qreal angle,
-                              qreal sweepLength)
-{
-    path.arcTo(cx-radius, cy-radius, radius * 2, radius * 2, angle, sweepLength);
+    QWidget::paintEvent(event);
 }
 
 #include "filemetadatatooltip.moc"