Merge lp:~agateau/unity-2d/show-launcher-from-home-button into lp:unity-2d/3.0

[Aurélien Gâteau]

[launcher] Only show launcher when moving over home button.

This branch implements the following changes:

- Make unity-2d-panel HomeButton applet call BeginForceVisible and EndForceVisible when mouse enters and leaves the button.

- IntelliHideBehavior has also been refactored to carry less state, which potentially fixes other bugs which could be triggered by the behavior instance being destroyed because the controller switched to the ForceVisibleBehavior.

This branch implements the following changes:

- Make unity-2d-panel HomeButton applet call BeginForceVisible and EndForceVisible when mouse enters and leaves the button.

- IntelliHideBehavior has also been refactored to carry less state, which potentially fixes other bugs which could be triggered by the behavior instance being destroyed because the controller switched to the ForceVisibleBehavior.

[Ugo Riboni (uriboni)]

Code works, except for the following problem that breaks autohide and keeps the launcher always visible:

- put a window across the launcher so it does autohide
- go to the home button, the launcher appears
- push the home button, the dash appears
- click the workspaces switcher button in launcher, spread appears
- exit the spread to the same workspace where you were initially

The launcher is now stuck and always visible.
Please note that i'm running all 4 unity-2d components from the branch where i merged your code.

review: Needs Fixing

[Ugo Riboni (uriboni)]

Approving anyway as the next work in the pipeline for Aurelien should help fix that issue and similar ones

review: Approve

[Bob The Builder (bobthebuilder-deactivatedaccount)]

No proposals found for merge of lp:~agateau/unity-2d/keep-launcher-when-dash-is-visible into lp:unity-2d.

=== modified file 'launcher/app/autohidebehavior.cpp'
--- launcher/app/autohidebehavior.cpp	2011-03-10 10:00:33 +0000
+++ launcher/app/autohidebehavior.cpp	2011-03-22 15:21:34 +0000
@@ -36,17 +36,13 @@
 
 AutoHideBehavior::AutoHideBehavior(Unity2dPanel* panel)
 : AbstractVisibilityBehavior(panel)
-, m_mouseArea(new MouseArea(this))
 , m_autohideTimer(new QTimer(this))
 {
-    connect(m_mouseArea, SIGNAL(entered()), m_panel, SLOT(slideIn()));
-
     m_autohideTimer->setSingleShot(true);
     m_autohideTimer->setInterval(AUTOHIDE_TIMEOUT);
     connect(m_autohideTimer, SIGNAL(timeout()), m_panel, SLOT(slideOut()));
 
     m_panel->installEventFilter(this);
-    updateFromPanelGeometry();
     if (!m_panel->geometry().contains(QCursor::pos())) {
         if (m_panel->delta() == 0) {
             /* Launcher is fully visible */
@@ -69,21 +65,10 @@
         m_autohideTimer->stop();
         break;
     case QEvent::Leave:
-        if (!m_mouseArea->containsMouse()) {
-            m_autohideTimer->start();
-        }
-        break;
-    case QEvent::Resize:
-        updateFromPanelGeometry();
+        m_autohideTimer->start();
         break;
     default:
         break;
     }
     return false;
 }
-
-void AutoHideBehavior::updateFromPanelGeometry()
-{
-    QRect rect(0, m_panel->y(), 1, m_panel->height());
-    m_mouseArea->setGeometry(rect);
-}

=== modified file 'launcher/app/autohidebehavior.h'
--- launcher/app/autohidebehavior.h	2011-03-10 10:00:33 +0000
+++ launcher/app/autohidebehavior.h	2011-03-22 15:21:34 +0000
@@ -28,7 +28,6 @@
 #include <QObject>
 
 class QTimer;
-class MouseArea;
 class Unity2dPanel;
 
 /**
@@ -45,11 +44,7 @@
     bool eventFilter(QObject*, QEvent*);
 
 private:
-    MouseArea* m_mouseArea;
     QTimer* m_autohideTimer;
-    bool m_requestAttention;
-
-    void updateFromPanelGeometry();
 };
 
 #endif /* AUTOHIDEBEHAVIOR_H */

=== modified file 'launcher/app/intellihidebehavior.cpp'
--- launcher/app/intellihidebehavior.cpp	2011-03-15 11:37:03 +0000
+++ launcher/app/intellihidebehavior.cpp	2011-03-22 15:21:34 +0000
@@ -15,7 +15,6 @@
 
 // libunity-2d
 #include <debug_p.h>
-#include <mousearea.h>
 #include <unity2dpanel.h>
 
 // Qt
@@ -63,19 +62,14 @@
 
 IntelliHideBehavior::IntelliHideBehavior(Unity2dPanel* panel)
 : AbstractVisibilityBehavior(panel)
-, m_mouseArea(new MouseArea(this))
 , m_activeWindow(0)
-, m_visibility(VisiblePanel)
 {
     m_panel->installEventFilter(this);
 
-    connect(m_mouseArea, SIGNAL(entered()), SLOT(forceVisiblePanel()));
-
     WnckScreen* screen = wnck_screen_get_default();
     g_signal_connect(G_OBJECT(screen), "active-window-changed", G_CALLBACK(activeWindowChangedCB), this);
     g_signal_connect(G_OBJECT(screen), "active-workspace-changed", G_CALLBACK(activeWorkspaceChangedCB), this);
 
-    updateFromPanelGeometry();
     /* Delay monitoring the active window giving time to the user to reach
        for the panel before it disappears */
     QTimer::singleShot(1000, this, SLOT(updateActiveWindowConnections()));
@@ -118,7 +112,7 @@
 
 void IntelliHideBehavior::updateVisibility()
 {
-    if (m_visibility == ForceVisiblePanel) {
+    if (isMouseForcingVisibility()) {
         return;
     }
     int launcherPid = getpid();
@@ -166,41 +160,24 @@
         }
     }
 
-    m_visibility = crossWindow ? HiddenPanel : VisiblePanel;
-    slidePanel();
+    if (crossWindow) {
+        m_panel->slideOut();
+    } else {
+        m_panel->slideIn();
+    }
 }
 
 bool IntelliHideBehavior::eventFilter(QObject* object, QEvent* event)
 {
-    if (event->type() == QEvent::Leave && !m_mouseArea->containsMouse() && m_visibility == ForceVisiblePanel) {
-        m_visibility = VisiblePanel;
+    if (event->type() == QEvent::Leave && !isMouseForcingVisibility()) {
         updateVisibility();
     } else if (event->type() == QEvent::Resize) {
-        updateFromPanelGeometry();
         updateVisibility();
     }
     return false;
 }
 
-void IntelliHideBehavior::slidePanel()
-{
-    if (m_visibility != HiddenPanel) {
-        m_panel->slideIn();
-    } else {
-        m_panel->slideOut();
-    }
-}
-
-void IntelliHideBehavior::updateFromPanelGeometry()
-{
-    QRect rect(0, m_panel->y(), 1, m_panel->height());
-    m_mouseArea->setGeometry(rect);
-}
-
-void IntelliHideBehavior::forceVisiblePanel()
-{
-    if (m_visibility != ForceVisiblePanel) {
-        m_visibility = ForceVisiblePanel;
-        slidePanel();
-    }
+bool IntelliHideBehavior::isMouseForcingVisibility() const
+{
+    return m_panel->underMouse();
 }

=== modified file 'launcher/app/intellihidebehavior.h'
--- launcher/app/intellihidebehavior.h	2011-03-10 10:00:33 +0000
+++ launcher/app/intellihidebehavior.h	2011-03-22 15:21:34 +0000
@@ -19,7 +19,6 @@
 
 struct _WnckWindow;
 
-class MouseArea;
 class Unity2dPanel;
 
 /**
@@ -38,27 +37,20 @@
 private Q_SLOTS:
     void updateVisibility();
     void updateActiveWindowConnections();
-    void forceVisiblePanel();
 
 private:
     Q_DISABLE_COPY(IntelliHideBehavior);
 
     enum PanelVisibility {
         VisiblePanel,
-        HiddenPanel,
-        ForceVisiblePanel
+        HiddenPanel
     };
 
-    // A 1px invisible area used to force the panel to be visible if the user
-    // hits the edge of the screen with the mouse cursor
-    MouseArea* m_mouseArea;
-
     struct _WnckWindow* m_activeWindow;
-    PanelVisibility m_visibility;
 
-    void slidePanel();
-    void updateFromPanelGeometry();
     void disconnectFromGSignals();
+
+    bool isMouseForcingVisibility() const;
 };
 
 #endif /* INTELLIHIDEBEHAVIOR_H */

=== modified file 'panel/applets/CMakeLists.txt'
--- panel/applets/CMakeLists.txt	2011-03-01 09:04:13 +0000
+++ panel/applets/CMakeLists.txt	2011-03-22 15:21:34 +0000
@@ -68,6 +68,7 @@
     ${WNCK_INCLUDE_DIRS}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${X11_INCLUDE_DIR}
+    ${libunity-2d-private_SOURCE_DIR}/src
     )
 
 add_library(uqapplets ${uqapplets_SRCS})
@@ -85,4 +86,5 @@
     ${X11_Xcomposite_LIB}
     ${X11_Xdamage_LIB}
     ${X11_Xfixes_LIB}
+    unity-2d-private
     )

=== modified file 'panel/applets/homebutton/homebuttonapplet.cpp'
--- panel/applets/homebutton/homebuttonapplet.cpp	2011-03-17 13:14:29 +0000
+++ panel/applets/homebutton/homebuttonapplet.cpp	2011-03-22 15:21:34 +0000
@@ -25,6 +25,9 @@
 // Local
 #include <debug_p.h>
 
+// libunity-2d
+#include <launcherclient.h>
+
 // Qt
 #include <QHBoxLayout>
 #include <QDBusInterface>
@@ -35,7 +38,10 @@
 static const char* DBUS_PATH = "/Dash";
 static const char* DBUS_IFACE = "com.canonical.Unity2d.Dash";
 
-HomeButtonApplet::HomeButtonApplet() : m_button(new QToolButton), m_dashInterface(NULL)
+HomeButtonApplet::HomeButtonApplet()
+: m_button(new QToolButton)
+, m_dashInterface(NULL)
+, m_launcherClient(new LauncherClient(this))
 {
     m_button->setAutoRaise(true);
     QIcon::setThemeName("unity-icon-theme");
@@ -107,4 +113,16 @@
     }
 }
 
+void HomeButtonApplet::enterEvent(QEvent* event)
+{
+    Unity2d::Applet::enterEvent(event);
+    m_launcherClient->beginForceVisible();
+}
+
+void HomeButtonApplet::leaveEvent(QEvent* event)
+{
+    Unity2d::Applet::leaveEvent(event);
+    m_launcherClient->endForceVisible();
+}
+
 #include "homebuttonapplet.moc"

=== modified file 'panel/applets/homebutton/homebuttonapplet.h'
--- panel/applets/homebutton/homebuttonapplet.h	2011-01-15 01:41:03 +0000
+++ panel/applets/homebutton/homebuttonapplet.h	2011-03-22 15:21:34 +0000
@@ -29,6 +29,7 @@
 #include <QToolButton>
 
 class QDBusInterface;
+class LauncherClient;
 
 class HomeButtonApplet : public Unity2d::Applet
 {
@@ -36,6 +37,10 @@
 public:
     HomeButtonApplet();
 
+protected:
+    void enterEvent(QEvent*);
+    void leaveEvent(QEvent*);
+
 private Q_SLOTS:
     void toggleDash();
     void connectToDash();
@@ -44,6 +49,7 @@
     Q_DISABLE_COPY(HomeButtonApplet)
     QToolButton* m_button;
     QDBusInterface* m_dashInterface;
+    LauncherClient* m_launcherClient;
 };
 
 #endif /* HOMEBUTTONAPPLET_H */