ToolTip->ToolTipArea

examples/applets/testcomponents/contents/ui/IconsPage.qml

@@ -91,103 +91,67 @@ PlasmaComponents.Page {
 
         Row {
             spacing: _s
-            PlasmaCore.IconItem {
+            PlasmaCore.ToolTipArea {
-                id: akonadiIcon
+                width: childrenRect.width
-                objectName: "akonadiIcon"
+                height: childrenRect.height
-                source: "akonadi"
+                icon: "klipper"
-                width: height
+                mainText: "Fish sighted in the wild, in the wild, a fish was seen."
-                height: _h
+                subText: "A mean-looking grouper swam by."
-                //anchors.horizontalCenter: parent.horizontalCenter
+                PlasmaCore.IconItem {
-                Rectangle { color: "orange"; opacity: 0.3; anchors.fill: parent; }
+                    id: akonadiIcon
-                PlasmaCore.ToolTip {
+                    objectName: "akonadiIcon"
-                    anchors.fill: parent
+                    source: "akonadi"
-                    target: akonadiIcon
+                    width: height
-                    icon: "klipper"
+                    height: _h
-                    mainText: "Fish sighted in the wild, in the wild, a fish was seen."
+                    //anchors.horizontalCenter: parent.horizontalCenter
-                    subText: "A mean-looking grouper swam by."
+                    Rectangle { color: "orange"; opacity: 0.3; anchors.fill: parent; }
                 }
             }
-            Image {
+            PlasmaCore.ToolTipArea {
-                objectName: "bridgeimage"
                 height: _h
                 width: height
-                fillMode: Image.PreserveAspectFit
+                image: bridgeimage.source
-                source: "../images/bridge.jpg"
+                mainText: "Bridge"
-                PlasmaCore.ToolTip {
+                subText: "Waalbrug."
-                    target: parent
+                Image {
-                    image: parent.source
+                    id: bridgeimage
-                    mainText: "Bridge"
+                    objectName: "bridgeimage"
-                    subText: "Waalbrug."
+                    height: _h
+                    width: height
+                    fillMode: Image.PreserveAspectFit
+                    source: "../images/bridge.jpg"
                 }
             }
-            Image {
+            PlasmaCore.ToolTipArea {
-                objectName: "surfboardimage"
+                width: childrenRect.width
-                height: _h
+                height: childrenRect.height
-                width: height
+                mainItem: PlasmaComponents.Label {
-                fillMode: Image.PreserveAspectFit
+                    text: "Nijmegen North Beach"
-                source: "../images/surfboard.jpg"
+                    anchors.centerIn: parent
-                PlasmaCore.ToolTip {
+                }
-                    anchors.fill: parent
+                Image {
-                    image: parent.source
+                    objectName: "surfboardimage"
-                    mainItem: PlasmaComponents.Label {
+                    height: _h
-                        text: "Nijmegen North Beach"
+                    width: height
-                        anchors.centerIn: parent
+                    fillMode: Image.PreserveAspectFit
-                    }
+                    source: "../images/surfboard.jpg"
 
                     //subText: "A surfboard on the beach. <br />The photo shows the Waal river's north beach, \
                     //across the water from Nijmegen, Netherlands. It was taken during the summer festivals a few years back."
                 }
             }
-            PlasmaComponents.Button {
+            PlasmaCore.ToolTipArea {
-                text: "Button"
+                width: childrenRect.width
-                iconSource: "call-start"
+                height: childrenRect.height
-                PlasmaCore.ToolTip {
+                mainText: "Tooltip on button"
-                    target: parent
+                PlasmaComponents.Button {
-                    mainText: "Tooltip on button"
+                    id: button
-                }
+                    text: "Button"
-            }
+                    iconSource: "call-start"
-
-
-            QtExtras.MouseEventListener {
-                id: task1
-
-                width: height
-                height: _h*2
-
-                hoverEnabled: true
-
-                onContainsMouseChanged: {
-                    if (containsMouse) {
-                        print("Setting target to task1");
-                        tooltip.target = task1;
-                        tooltip.mainText = "Bridge"
-                        tooltip.subText = "in Nijmegen"
-                    } else {
-                        print("Setting target to null");
-                        tooltip.target = null;
-                    }
-                }
-                Image {
-                    objectName: "bridgeimage1"
-                    anchors.fill: parent
-                    fillMode: Image.PreserveAspectFit
-                    source: "../images/bridge.jpg"
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked: {
-                            print("bridgeimage1 clicked");
-                        }
-                    }
                 }
             }
 
 
         }
     }
-
-    PlasmaCore.ToolTip {
-        id: tooltip
-        target: null
-    }
-
 }

src/declarativeimports/core/corebindingsplugin.cpp

@@ -85,7 +85,7 @@ void CoreBindingsPlugin::registerTypes(const char *uri)
     qmlRegisterType<Plasma::SortFilterModel>(uri, 2, 0, "SortFilterModel");
 
     qmlRegisterType<DialogProxy>(uri, 2, 0, "Dialog");
-    qmlRegisterType<ToolTip>(uri, 2, 0, "ToolTip");
+    qmlRegisterType<ToolTip>(uri, 2, 0, "ToolTipArea");
 
     qmlRegisterInterface<Plasma::Service>("Service");
     qRegisterMetaType<Plasma::Service*>("Service");

src/declarativeimports/core/private/DefaultToolTip.qml

@@ -90,7 +90,6 @@ Item {
     PlasmaExtras.Heading {
         id: tooltipMaintext
         level: 3
-        width: parent.preferredTextWidth
         wrapMode: Text.WordWrap
         text: toolTip ? toolTip.mainText : ""
         anchors {

src/declarativeimports/core/tooltip.cpp

@@ -35,9 +35,11 @@ ToolTip::ToolTip(QQuickItem *parent)
     m_showTimer = new QTimer(this);
     m_showTimer->setSingleShot(true);
     connect(m_showTimer, &QTimer::timeout, [=]() {
-        setVisible(true);
+        showToolTip();
     });
+
     setAcceptHoverEvents(true);
+    setFiltersChildMouseEvents(true);
 }
 
 ToolTip::~ToolTip()
@@ -58,60 +60,26 @@ void ToolTip::setMainItem(QQuickItem *mainItem)
     }
 }
 
-QQuickItem *ToolTip::target() const
+void ToolTip::showToolTip()
-{
-    if (m_target.data()) {
-        return m_target.data();
-    } else {
-        QQuickItem *qqi = qobject_cast<QQuickItem*>(parent());
-        return qqi;
-    }
-}
-
-void ToolTip::setTarget(QQuickItem *target)
-{
-    if (m_target.data() == target) {
-        return;
-    }
-
-    m_target = target;
-    setParentItem(target);
-
-    property("anchors").value<QObject *>()->setProperty("fill", QVariant::fromValue(parentItem()));
-
-    emit targetChanged();
-}
-
-bool ToolTip::isVisible() const
 {
     ToolTipDialog *dlg = ToolTipDialog::instance();
-    return (dlg->mainItem() == mainItem() && mainItem() && mainItem()->isVisible());
-}
 
-void ToolTip::setVisible(const bool visible)
+    if (!mainItem()) {
-{
+        setMainItem(dlg->loadDefaultItem());
-    ToolTipDialog *dlg = ToolTipDialog::instance();
-    if (visible) {
-
-        if (!mainItem()) {
-            setMainItem(dlg->loadDefaultItem());
-        }
-
-        if (dlg->mainItem()) {
-            dlg->mainItem()->setVisible(false);
-        }
-
-        if (mainItem()) {
-            mainItem()->setProperty("toolTip", QVariant::fromValue(this));
-            mainItem()->setVisible(true);
-        }
-
-        dlg->setMainItem(mainItem());
-        dlg->setVisualParent(target());
-        dlg->setVisible(true);
-    } else {
-        dlg->setVisible(false);
     }
+
+    if (dlg->mainItem()) {
+        dlg->mainItem()->setVisible(false);
+    }
+
+    if (mainItem()) {
+        mainItem()->setProperty("toolTip", QVariant::fromValue(this));
+        mainItem()->setVisible(true);
+    }
+
+    dlg->setMainItem(mainItem());
+    dlg->setVisible(true);
+    dlg->setVisualParent(this);
 }
 
 QString ToolTip::mainText() const
@@ -185,24 +153,20 @@ void ToolTip::setImage(const QVariant &image)
 void ToolTip::hoverEnterEvent(QHoverEvent *event)
 {
     if (ToolTipDialog::instance()->isVisible()) {
-        //FIXME: setVisible needs to be renamed in sync or something like that
+        //FIXME: showToolTip needs to be renamed in sync or something like that
-        setVisible(true);
+        showToolTip();
     } else {
         m_showTimer->start(500);
     }
-
-    //relay the event
-    if (window()) {
-        window()->sendEvent(target(), event);
-    }
 }
 
 void ToolTip::hoverLeaveEvent(QHoverEvent *event)
 {
     m_showTimer->stop();
-
-    //relay the event
-    if (window()) {
-        window()->sendEvent(target(), event);
-    }
 }
+
+bool ToolTip::childMouseEventFilter(QQuickItem *item, QEvent *event)
+{
+    return QQuickItem::childMouseEventFilter(item, event);
+}
+

src/declarativeimports/core/tooltip.h

@@ -43,16 +43,6 @@ class ToolTip : public QQuickItem
      */
     Q_PROPERTY(QQuickItem *mainItem READ mainItem WRITE setMainItem NOTIFY mainItemChanged)
 
-    /**
-     * The main QML item that will be displayed in the Dialog
-     */
-    Q_PROPERTY(QQuickItem *target READ target WRITE setTarget NOTIFY targetChanged)
-
-    /**
-     * Visibility of the Dialog window. Doesn't have anything to do with the visibility of the mainItem.
-     */
-    Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
-
     /**
      * The main text of this tooltip
      */
@@ -81,11 +71,7 @@ public:
     QQuickItem *mainItem() const;
     void setMainItem(QQuickItem *mainItem);
 
-    QQuickItem *target() const;
+    void showToolTip();
-    void setTarget(QQuickItem *target);
-
-    bool isVisible() const;
-    void setVisible(const bool visible);
 
     QString mainText() const;
     void setMainText(const QString &mainText);
@@ -100,12 +86,12 @@ public:
     void setImage(const QVariant &image);
 
 protected:
+    bool childMouseEventFilter(QQuickItem *item, QEvent *event);
     void hoverEnterEvent(QHoverEvent *event);
     void hoverLeaveEvent(QHoverEvent *event);
 
 Q_SIGNALS:
     void mainItemChanged();
-    void targetChanged();
     void visibleChanged();
     void mainTextChanged();
     void subTextChanged();
@@ -114,7 +100,6 @@ Q_SIGNALS:
 
 private:
     QWeakPointer<QQuickItem> m_mainItem;
-    QWeakPointer<QQuickItem> m_target;
     QTimer *m_showTimer;
     QString m_mainText;
     QString m_subText;

src/plasmaquick/packageurlinterceptor.cpp

@@ -60,7 +60,7 @@ QUrl PackageUrlInterceptor::intercept(const QUrl &path, QQmlAbstractUrlIntercept
 
     if (path.scheme() == QStringLiteral("plasmapackage")) {
         //FIXME: this is incorrect but works around a bug in qml in resolution of urls of qmldir files
-        if (type == QQmlAbstractUrlInterceptor::QmldirFile) {
+        if (0&&type == QQmlAbstractUrlInterceptor::QmldirFile) {
             return QUrl(m_package.filePath(0, path.path()));
         } else {
             return QUrl::fromLocalFile(m_package.filePath(0, path.path()));