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

List:       kde-commits
Subject:    [kde-workspace/KDE/4.10] plasma/generic/applets/devicenotifier/package/contents/ui: Do not expand
From:       Jacopo De Simoi <wilderkde () gmail ! com>
Date:       2013-03-26 9:28:55
Message-ID: 20130326092855.85591A604F () git ! kde ! org
[Download RAW message or body]

Git commit fb5903f047f643210da4073087b404838557c03b by Jacopo De Simoi.
Committed on 26/03/2013 at 10:21.
Pushed by jacopods into branch 'KDE/4.10'.

Do not expand device after onNewData

In particular: every hover event triggers onNewData (why?) and
this caused the device to get expanded on hover AND the device notifier
to popup.

CCMAIL: lukas@kde.org

M  +7    -5    plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml


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

diff --git a/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml \
b/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml index \
                7191ed1..9b6132e 100644
--- a/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml
+++ b/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml
@@ -49,7 +49,7 @@ Item {
         property string last
         onSourceAdded: {
             last = source;
-            processLastDevice()
+            processLastDevice(true)
         }
 
         onSourceRemoved: {
@@ -60,21 +60,23 @@ Item {
         }
 
         onDataChanged: {
-            processLastDevice()
+            processLastDevice(true)
         }
 
         onNewData: {
             last = sourceName;
-            processLastDevice();
+            processLastDevice(false);
         }
 
-        function processLastDevice() {
+        function processLastDevice(expand) {
             if (last != "") {
                 if (devicesType == "all" ||
                     (devicesType == "removable" && data[last] && \
                data[last]["Removable"] == true) ||
                     (devicesType == "nonRemovable" && data[last] && \
data[last]["Removable"] == false)) {  updateTooltip();
-                    expandDevice(last)
+                    if (expand) {
+                        expandDevice(last)
+                    }
                     last = "";
                 }
             }


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