Merge lp:~aacid/unity-2d/unity-2d-shell_strutmanager_improvements into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Albert Astals Cid]

Improvements to the StrutManager

More signals, less need to tell it to update itself

[Florian Boucault (fboucault)]

In Shell.qml, you removed:

- height: declarativeView.screen.availableGeometry.height + (strutManager.enabled ? strutManager.height : 0)

It looks like an unrelated change.
I know that the height of the strutManager is 0 today but if it changes in the future (when we add the panel to the shell), we will forget to put it back.

[Florian Boucault (fboucault)]

Everything else is good to go.

=== modified file 'libunity-2d-private/src/strutmanager.cpp'
--- libunity-2d-private/src/strutmanager.cpp	2012-01-23 14:31:06 +0000
+++ libunity-2d-private/src/strutmanager.cpp	2012-02-09 09:32:19 +0000
@@ -47,6 +47,9 @@
    m_width(-1),
    m_height(-1)
 {
+    QDesktopWidget* desktop = QApplication::desktop();
+    connect(desktop, SIGNAL(resized(int)), SLOT(updateStrut()));
+    connect(desktop, SIGNAL(workAreaResized(int)), SLOT(updateStrut()));
 }
 
 StrutManager::~StrutManager()
@@ -81,8 +84,17 @@
 
 void StrutManager::setWidget(QObject *widget)
 {
-    m_widget = qobject_cast<QWidget*>(widget);
-    Q_ASSERT(m_widget != NULL);
+    if (m_widget != widget) {
+        if (m_widget) {
+            m_widget->removeEventFilter(this);
+            releaseStrut();
+        }
+        m_widget = qobject_cast<QWidget*>(widget);
+        Q_ASSERT(m_widget != NULL);
+        m_widget->installEventFilter(this);
+        updateStrut();
+        Q_EMIT widgetChanged(m_widget);
+    }
 }
 
 Unity2dPanel::Edge StrutManager::edge() const
@@ -92,8 +104,11 @@
 
 void StrutManager::setEdge(Unity2dPanel::Edge edge)
 {
-    m_edge = edge;
-    updateStrut();
+    if (m_edge != edge) {
+        m_edge = edge;
+        updateStrut();
+        Q_EMIT edgeChanged(m_edge);
+    }
 }
 
 int StrutManager::width() const
@@ -103,7 +118,11 @@
 
 void StrutManager::setWidth(int width)
 {
-    m_width = width;
+    if (m_width != width) {
+        m_width = width;
+        updateStrut();
+        Q_EMIT widthChanged(m_width);
+    }
 }
 
 int StrutManager::realWidth() const
@@ -124,7 +143,11 @@
 
 void StrutManager::setHeight(int height)
 {
-    m_height = height;
+    if (m_height != height) {
+        m_height = height;
+        updateStrut();
+        Q_EMIT heightChanged(m_height);
+    }
 }
 
 int StrutManager::realHeight() const
@@ -145,7 +168,6 @@
     }
 }
 
-
 void StrutManager::reserveStrut()
 {
     if (m_widget == NULL)
@@ -188,4 +210,14 @@
     setStrut(struts, m_widget->effectiveWinId());
 }
 
+bool StrutManager::eventFilter(QObject *watched, QEvent *event)
+{
+    Q_ASSERT(watched == m_widget);
+
+    if (event->type() == QEvent::Show || event->type() == QEvent::Resize) {
+        updateStrut();
+    }
+    return QObject::eventFilter(watched, event);
+}
+
 #include "strutmanager.moc"
 
=== modified file 'libunity-2d-private/src/strutmanager.h'
--- libunity-2d-private/src/strutmanager.h	2012-01-23 14:31:06 +0000
+++ libunity-2d-private/src/strutmanager.h	2012-02-09 09:32:19 +0000
@@ -30,10 +30,10 @@
 {
     Q_OBJECT
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
-    Q_PROPERTY(QObject* widget READ widget WRITE setWidget)
-    Q_PROPERTY(Unity2dPanel::Edge edge READ edge WRITE setEdge)
-    Q_PROPERTY(int width READ width WRITE setWidth)
-    Q_PROPERTY(int height READ height WRITE setHeight)
+    Q_PROPERTY(QObject* widget READ widget WRITE setWidget NOTIFY widgetChanged)
+    Q_PROPERTY(Unity2dPanel::Edge edge READ edge WRITE setEdge NOTIFY edgeChanged)
+    Q_PROPERTY(int width READ width WRITE setWidth NOTIFY widthChanged)
+    Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged)
 
 public:
     StrutManager();
@@ -73,10 +73,18 @@
      */
     int realHeight() const;
 
-    Q_INVOKABLE void updateStrut();
-
 Q_SIGNALS:
     void enabledChanged(bool enabled);
+    void widgetChanged(QObject *widget);
+    void edgeChanged(Unity2dPanel::Edge edge);
+    void widthChanged(int width);
+    void heightChanged(int height);
+
+protected:
+    bool eventFilter(QObject *watched, QEvent *event);
+
+private Q_SLOTS:
+    void updateStrut();
 
 private:
     void reserveStrut();
 
=== modified file 'libunity-2d-private/src/unity2dpanel.cpp'
--- libunity-2d-private/src/unity2dpanel.cpp	2012-02-07 11:57:10 +0000
+++ libunity-2d-private/src/unity2dpanel.cpp	2012-02-09 09:32:19 +0000
@@ -90,7 +90,6 @@
 
     void updateEdge()
     {
-        m_strutManager.updateStrut();
         updateGeometry();
         updateLayoutDirection();
     }
 
=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-02-08 14:53:49 +0000
+++ shell/Shell.qml	2012-02-09 09:32:19 +0000
@@ -26,7 +26,7 @@
     /* Space reserved by strutManager is taken off screen.availableGeometry but
        we want the shell to take all the available space, including the one we
        reserved ourselves via strutManager. */
-    height: declarativeView.screen.availableGeometry.height + (strutManager.enabled ? strutManager.height : 0)
+    height: declarativeView.screen.availableGeometry.height
     width: declarativeView.screen.availableGeometry.width + (strutManager.enabled ? strutManager.width : 0)
 
     Accessible.name: "shell"
@@ -170,9 +170,5 @@
         height: launcherLoader.height
         width: launcherLoader.width
         enabled: Utils.clamp(launcher2dConfiguration.hideMode, 0, 2) == 0
-
-        Component.onCompleted: {
-            strutManager.updateStrut()
-        }
     }
 }