Merge lp:~aacid/unity-2d/cache_spread_shown into lp:unity-2d

[Albert Astals Cid]

Use a internal cache for the spread shown value

Otherwise when the service becomes available it may happen that we do
the shownChanged(true) because it's shown and the shownChanged(true) because of
the direct connection between signals and thus the shell ends up with
two shownChanged(true) and forces the visibiity of the launcher twice, meaning
that if we are using hide-mode 1 the launcher will be stuck shown forever

Use a internal cache for the spread shown value

Otherwise when the service becomes available it may happen that we do
the shownChanged(true) because it's shown and the shownChanged(true) because of
the direct connection between signals and thus the shell ends up with
two shownChanged(true) and forces the visibiity of the launcher twice, meaning
that if we are using hide-mode 1 the launcher will be stuck shown forever

[Paweł Stołowski (stolowski)]

Great finding!

review: Approve

=== modified file 'libunity-2d-private/src/spreadmonitor.cpp'
--- libunity-2d-private/src/spreadmonitor.cpp	2012-02-09 11:38:44 +0000
+++ libunity-2d-private/src/spreadmonitor.cpp	2012-04-02 08:28:21 +0000
@@ -28,7 +28,8 @@
 
 SpreadMonitor::SpreadMonitor(QObject *parent)
     : AbstractDBusServiceMonitor("com.canonical.Unity2d.Spread", "/Spread",
-                                "com.canonical.Unity2d.Spread", parent)
+                                "com.canonical.Unity2d.Spread", parent),
+      m_shown(false)
 {
     connect(this, SIGNAL(serviceAvailableChanged(bool)), SLOT(onServiceAvailableChanged(bool)));
 
@@ -40,22 +41,35 @@
 void SpreadMonitor::onServiceAvailableChanged(bool available)
 {
     if (available) {
-        connect(dbusInterface(), SIGNAL(IsShownChanged(bool)), SIGNAL(shownChanged(bool)));
+        connect(dbusInterface(), SIGNAL(IsShownChanged(bool)), SLOT(internalSetShown(bool)));
 
         /* In SpreadMonitor::shown() we assume shown is false if the service is not
            available therefore there is no need to emit shownChanged if it is still false */
-        if (shown()) {
-            Q_EMIT shownChanged(true);
+        if (dbusShown()) {
+            internalSetShown(true);
         }
     } else {
         /* At this point we cannot know for sure that the spread was shown so
            we emit the changed signal unconditionally */
-        Q_EMIT shownChanged(false);
+        internalSetShown(false);
     }
 }
 
 bool SpreadMonitor::shown() const
 {
+    return m_shown;
+}
+
+void SpreadMonitor::internalSetShown(bool shown)
+{
+    if (shown != m_shown) {
+        m_shown = shown;
+        Q_EMIT shownChanged(m_shown);
+    }
+}
+
+bool SpreadMonitor::dbusShown() const
+{
     if (dbusInterface() == 0) {
         return false;
     } else {

=== modified file 'libunity-2d-private/src/spreadmonitor.h'
--- libunity-2d-private/src/spreadmonitor.h	2012-02-08 15:12:09 +0000
+++ libunity-2d-private/src/spreadmonitor.h	2012-04-02 08:28:21 +0000
@@ -41,6 +41,14 @@
 
 Q_SIGNALS:
     void shownChanged(bool visible);
+
+private Q_SLOTS:
+    void internalSetShown(bool shown);
+
+private:
+    bool dbusShown() const;
+
+    bool m_shown;
 };
 
 Q_DECLARE_METATYPE(SpreadMonitor*)

=== modified file 'tests/manual-tests/launcher.txt'
--- tests/manual-tests/launcher.txt	2012-03-28 10:43:57 +0000
+++ tests/manual-tests/launcher.txt	2012-04-02 08:28:21 +0000
@@ -115,3 +115,8 @@
 
 Verify that the shell starts without problems (does not segfault) (Do it multiple times since there's the odd time it works)
 ----
+
+ * Use hide-mode 1. killall both unity-2d-shell and unity-2d-spread. Start only the shell. Click twice on the launcher spread icon. Move the mouse away from the launcher
+
+Verify that the launcher hides correctly
+----