[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace/plasma/sreich/sal-qml] plasma/netbook/containments/sal/package/contents/ui: only show
From:       Shaun Reich <shaun.reich () kdemail ! net>
Date:       2012-05-05 3:47:58
Message-ID: 20120505034758.91E7FA60BB () git ! kde ! org
[Download RAW message or body]

Git commit b7c62cca56600e72cb82e378b21cbd94a0d8e536 by Shaun Reich.
Committed on 05/05/2012 at 05:47.
Pushed by sreich into branch 'plasma/sreich/sal-qml'.

only show the tooltip when the Result text is being truncated/ellided

M  +2    -0    plasma/netbook/containments/sal/package/contents/ui/Result.qml
M  +5    -1    plasma/netbook/containments/sal/package/contents/ui/ResultsView.qml

http://commits.kde.org/kde-workspace/b7c62cca56600e72cb82e378b21cbd94a0d8e536

diff --git a/plasma/netbook/containments/sal/package/contents/ui/Result.qml \
b/plasma/netbook/containments/sal/package/contents/ui/Result.qml index \
                c1d580e..9886bc4 100644
--- a/plasma/netbook/containments/sal/package/contents/ui/Result.qml
+++ b/plasma/netbook/containments/sal/package/contents/ui/Result.qml
@@ -29,7 +29,9 @@ Item {
     property alias currentIcon: resultIcon.icon;
     property string currentUrl;
     property string currentId;
+    //to allow public access to these members..
     property alias favoriteIcon: favoriteIcon
+    property alias resultLabel: resultLabel
 
     width: iconWidth * 2
     //FIXME also hardcoded. probably use a text metric
diff --git a/plasma/netbook/containments/sal/package/contents/ui/ResultsView.qml \
b/plasma/netbook/containments/sal/package/contents/ui/ResultsView.qml index \
                2469696..fe1960f 100644
--- a/plasma/netbook/containments/sal/package/contents/ui/ResultsView.qml
+++ b/plasma/netbook/containments/sal/package/contents/ui/ResultsView.qml
@@ -133,7 +133,11 @@ Item {
             }
 
             function resultEntered() {
-                tooltipShowTimer.restart()
+                if (resultLabel.truncated == true) {
+                    // there's not enough room for the result's text to be \
displayed, so it's +                    // being ellided/truncated. only then should \
the tooltip be shown. +                    tooltipShowTimer.restart()
+                }
 
                 gridView.currentIndex = index
             }


[prev in list] [next in list] [prev in thread] [next in thread]