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

[Albert Astals Cid]

[launcher] Restore the strut on the left when the launcher is on AlwaysVisibleBehavior mode

[Albert Astals Cid (aacid)]

There is a test for this at https://code.launchpad.net/~aacid/unity-2d/unity-2d_test_strut_launcher_always_visible/+merge/89697

[Michał Sawicz (saviq)]

* any reason why you do have an onChanged signal for enabled but not for edge?
* looks to me like we can drop the useStrut property altogether?
* I'm thinking the StrutManager could be moved to Shell.qml? and it's the launcherLoader's height / width is what should be used for the strut height / width

review: Needs Fixing

[Albert Astals Cid (aacid)]

StrutManager moved to Shell.qml, the other two are a non issue as discussed on IRC

[Michał Sawicz (saviq)]

review: Approve

[Michał Sawicz (saviq)]

Attempt to merge into lp:~unity-2d-team/unity-2d/unity-2d-shell failed due to conflicts:

text conflict in libunity-2d-private/src/unity2dpanel.cpp

[lp:~aacid/unity-2d/unity-2d-shell_readd_struts_support]

926. By Albert Astals Cid on 2012-01-24

merge

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2012-01-20 13:42:51 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2012-01-24 15:19:26 +0000
@@ -73,6 +73,8 @@
 #include "inputshapemanager.h"
 #include "inputshaperectangle.h"
 #include "inputshapemask.h"
+#include "unity2dpanel.h"
+#include "strutmanager.h"
 
 #include <QtDeclarative/qdeclarative.h>
 #include <QDeclarativeEngine>
@@ -171,6 +173,9 @@
     qmlRegisterType<InputShapeRectangle>(uri, 0, 1, "InputShapeRectangle");
     qmlRegisterType<InputShapeMask>(uri, 0, 1, "InputShapeMask");
     qmlRegisterType<Unity2DDeclarativeView>();
+
+    qmlRegisterType<Unity2dPanel>(uri, 0, 1, "Unity2dPanel");
+    qmlRegisterType<StrutManager>(uri, 0, 1, "StrutManager");
 }
 
 void Unity2dPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2012-01-24 08:38:24 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2012-01-24 15:19:26 +0000
@@ -74,6 +74,7 @@
     inputshapemanager.cpp
     inputshaperectangle.cpp
     inputshapemask.cpp
+    strutmanager.cpp
     )
 
 # Build

=== added file 'libunity-2d-private/src/strutmanager.cpp'
--- libunity-2d-private/src/strutmanager.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/strutmanager.cpp	2012-01-24 15:19:26 +0000
@@ -0,0 +1,191 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010, 2012 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ * - Albert Astals Cid <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Self
+#include "strutmanager.h"
+
+// Qt
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QX11Info>
+
+// X
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+
+static void setStrut(ulong* struts, WId effectiveWinId)
+{
+    static Atom atom = XInternAtom(QX11Info::display(), "_NET_WM_STRUT_PARTIAL", False);
+    XChangeProperty(QX11Info::display(), effectiveWinId, atom,
+                    XA_CARDINAL, 32, PropModeReplace,
+                    (unsigned char *) struts, 12);
+}
+
+StrutManager::StrutManager()
+ : m_enabled(true),
+   m_widget(NULL),
+   m_edge(Unity2dPanel::TopEdge),
+   m_width(-1),
+   m_height(-1)
+{
+}
+
+StrutManager::~StrutManager()
+{
+    if (m_enabled) {
+        releaseStrut();
+    }
+}
+
+bool StrutManager::enabled() const
+{
+    return m_enabled;
+}
+
+void StrutManager::setEnabled(bool value)
+{
+    if (m_enabled != value) {
+        if (value) {
+            reserveStrut();
+        } else {
+            releaseStrut();
+        }
+        m_enabled = value;
+        Q_EMIT enabledChanged(value);
+    }
+}
+
+QObject *StrutManager::widget() const
+{
+    return m_widget;
+}
+
+void StrutManager::setWidget(QObject *widget)
+{
+    m_widget = qobject_cast<QWidget*>(widget);
+    Q_ASSERT(m_widget != NULL);
+}
+
+Unity2dPanel::Edge StrutManager::edge() const
+{
+    return m_edge;
+}
+
+void StrutManager::setEdge(Unity2dPanel::Edge edge)
+{
+    m_edge = edge;
+    updateStrut();
+}
+
+int StrutManager::width() const
+{
+    return m_width;
+}
+
+void StrutManager::setWidth(int width)
+{
+    m_width = width;
+}
+
+int StrutManager::realWidth() const
+{
+    if (m_widget == NULL)
+        return m_width;
+
+    if (m_width == -1)
+        return m_widget->width();
+
+    return m_width;
+}
+
+int StrutManager::height() const
+{
+    return m_height;
+}
+
+void StrutManager::setHeight(int height)
+{
+    m_height = height;
+}
+
+int StrutManager::realHeight() const
+{
+    if (m_widget == NULL)
+        return m_height;
+
+    if (m_height == -1)
+        return m_widget->height();
+
+    return m_height;
+}
+
+void StrutManager::updateStrut()
+{
+    if (m_enabled) {
+        reserveStrut();
+    }
+}
+
+
+void StrutManager::reserveStrut()
+{
+    if (m_widget == NULL)
+        return;
+
+    QDesktopWidget* desktop = QApplication::desktop();
+    const QRect screen = desktop->screenGeometry(m_widget);
+    const QRect available = desktop->availableGeometry(m_widget);
+
+    ulong struts[12] = {};
+    switch (m_edge) {
+    case Unity2dPanel::LeftEdge:
+        if (QApplication::isLeftToRight()) {
+            struts[0] = realWidth();
+            struts[4] = available.top();
+            struts[5] = available.y() + available.height();
+        } else {
+            struts[1] = realWidth();
+            struts[6] = available.top();
+            struts[7] = available.y() + available.height();
+        }
+        break;
+    case Unity2dPanel::TopEdge:
+        struts[2] = realHeight();
+        struts[8] = screen.left();
+        struts[9] = screen.x() + screen.width();
+        break;
+    }
+
+    setStrut(struts, m_widget->effectiveWinId());
+}
+
+void StrutManager::releaseStrut()
+{
+    if (m_widget == NULL)
+        return;
+
+    ulong struts[12];
+    memset(struts, 0, sizeof struts);
+    setStrut(struts, m_widget->effectiveWinId());
+}
+
+#include "strutmanager.moc"

=== added file 'libunity-2d-private/src/strutmanager.h'
--- libunity-2d-private/src/strutmanager.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/strutmanager.h	2012-01-24 15:19:26 +0000
@@ -0,0 +1,92 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010, 2012 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ * - Albert Astals Cid <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef STRUTMANAGER_H
+#define STRUTMANAGER_H
+
+// Unity 2D
+#include "unity2dpanel.h"
+
+class StrutManager : public QObject
+{
+    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)
+
+public:
+    StrutManager();
+    ~StrutManager();
+
+    bool enabled() const;
+    void setEnabled(bool value);
+
+    // QObject due to QML constraints
+    QObject *widget() const;
+    void setWidget(QObject *widget);
+
+    Unity2dPanel::Edge edge() const;
+    void setEdge(Unity2dPanel::Edge edge);
+
+    /**
+     * Returns the width set to the strut manager
+     * If is -1 (the default value) will use the width of the widget given in setWidget
+     */
+    int width() const;
+    void setWidth(int width);
+    /**
+     * Returns the actual width in use by the strut manager
+     * It is either width() or m_widget->width()
+     */
+    int realWidth() const;
+
+    /**
+     * Returns the height set to the strut manager
+     * If is -1 (the default value) will use the height of the widget given in setWidget
+     */
+    int height() const;
+    void setHeight(int height);
+    /**
+     * Returns the actual height in use by the strut manager
+     * It is either width() or m_widget->width()
+     */
+    int realHeight() const;
+
+    Q_INVOKABLE void updateStrut();
+
+Q_SIGNALS:
+    void enabledChanged(bool enabled);
+
+private:
+    void reserveStrut();
+    void releaseStrut();
+
+    bool m_enabled;
+    QWidget *m_widget;
+    Unity2dPanel::Edge m_edge;
+    int m_width;
+    int m_height;
+};
+
+#endif /* STRUTMANAGER_H */
\ No newline at end of file

=== modified file 'libunity-2d-private/src/unity2dpanel.cpp'
--- libunity-2d-private/src/unity2dpanel.cpp	2012-01-24 12:58:01 +0000
+++ libunity-2d-private/src/unity2dpanel.cpp	2012-01-24 15:19:26 +0000
@@ -21,6 +21,7 @@
 
 // Self
 #include "unity2dpanel.h"
+#include "strutmanager.h"
 #include <debug_p.h>
 #include <indicatorsmanager.h>
 
@@ -32,10 +33,6 @@
 #include <QHBoxLayout>
 #include <QX11Info>
 
-// X
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-
 static const int SLIDE_DURATION = 125;
 
 struct Unity2dPanelPrivate
@@ -44,53 +41,9 @@
     Unity2dPanel::Edge m_edge;
     mutable IndicatorsManager* m_indicatorsManager;
     QHBoxLayout* m_layout;
-    bool m_useStrut;
     int m_delta;
     bool m_manualSliding;
-
-    void setStrut(ulong* struts)
-    {
-        static Atom atom = XInternAtom(QX11Info::display(), "_NET_WM_STRUT_PARTIAL", False);
-        XChangeProperty(QX11Info::display(), q->effectiveWinId(), atom,
-                        XA_CARDINAL, 32, PropModeReplace,
-                        (unsigned char *) struts, 12);
-    }
-
-    void reserveStrut()
-    {
-        QDesktopWidget* desktop = QApplication::desktop();
-        const QRect screen = desktop->screenGeometry(q);
-        const QRect available = desktop->availableGeometry(q);
-
-        ulong struts[12] = {};
-        switch (m_edge) {
-        case Unity2dPanel::LeftEdge:
-            if (QApplication::isLeftToRight()) {
-                struts[0] = q->width();
-                struts[4] = available.top();
-                struts[5] = available.y() + available.height();
-            } else {
-                struts[1] = q->width();
-                struts[6] = available.top();
-                struts[7] = available.y() + available.height();
-            }
-            break;
-        case Unity2dPanel::TopEdge:
-            struts[2] = q->height();
-            struts[8] = screen.left();
-            struts[9] = screen.x() + screen.width();
-            break;
-        }
-
-        setStrut(struts);
-    }
-
-    void releaseStrut()
-    {
-        ulong struts[12];
-        memset(struts, 0, sizeof struts);
-        setStrut(struts);
-    }
+    StrutManager m_strutManager;
 
     void updateGeometry()
     {
@@ -134,9 +87,7 @@
 
     void updateEdge()
     {
-        if (m_useStrut) {
-            reserveStrut();
-        }
+        m_strutManager.updateStrut();
         updateGeometry();
         updateLayoutDirection();
     }
@@ -146,10 +97,11 @@
 : QWidget(parent)
 , d(new Unity2dPanelPrivate)
 {
+    d->m_strutManager.setWidget(this);
+    d->m_strutManager.setEdge(Unity2dPanel::TopEdge);
     d->q = this;
     d->m_edge = Unity2dPanel::TopEdge;
     d->m_indicatorsManager = 0;
-    d->m_useStrut = true;
     d->m_delta = 0;
     d->m_manualSliding = false;
     d->m_layout = new QHBoxLayout(this);
@@ -166,19 +118,18 @@
     }
     
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), SLOT(slotWorkAreaResized(int)));
+    connect(&d->m_strutManager, SIGNAL(enabledChanged(bool)), SIGNAL(useStrutChanged(bool)));
 }
 
 Unity2dPanel::~Unity2dPanel()
 {
-    if (d->m_useStrut) {
-        d->releaseStrut();
-    }
     delete d;
 }
 
 void Unity2dPanel::setEdge(Unity2dPanel::Edge edge)
 {
     d->m_edge = edge;
+    d->m_strutManager.setEdge(edge);
     if (isVisible()) {
         d->updateEdge();
     }
@@ -232,20 +183,12 @@
 
 bool Unity2dPanel::useStrut() const
 {
-    return d->m_useStrut;
+    return d->m_strutManager.enabled();
 }
 
 void Unity2dPanel::setUseStrut(bool value)
 {
-    if (d->m_useStrut != value) {
-        if (value) {
-            d->reserveStrut();
-        } else {
-            d->releaseStrut();
-        }
-        d->m_useStrut = value;
-        Q_EMIT useStrutChanged(value);
-    }
+    d->m_strutManager.setEnabled(value);
 }
 
 int Unity2dPanel::delta() const

=== modified file 'libunity-2d-private/src/unity2dpanel.h'
--- libunity-2d-private/src/unity2dpanel.h	2012-01-24 12:58:01 +0000
+++ libunity-2d-private/src/unity2dpanel.h	2012-01-24 15:19:26 +0000
@@ -45,6 +45,7 @@
      */
     Q_PROPERTY(int manualSliding READ manualSliding WRITE setManualSliding NOTIFY manualSlidingChanged)
     Q_PROPERTY(bool useStrut READ useStrut WRITE setUseStrut NOTIFY useStrutChanged)
+    Q_ENUMS(Edge)
 
 public:
     enum Edge {

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-01-19 15:07:09 +0000
+++ shell/Shell.qml	2012-01-24 15:19:26 +0000
@@ -19,6 +19,7 @@
 import QtQuick 1.1
 import Unity2d 1.0
 import "launcher"
+import "common/utils.js" as Utils
 
 Item {
     id: shell
@@ -140,4 +141,17 @@
             }
         }
     }
+
+    StrutManager {
+        id: strutManager
+        edge: Unity2dPanel.LeftEdge
+        widget: declarativeView
+        height: launcherLoader.height
+        width: launcherLoader.width
+        enabled: Utils.clamp(launcher2dConfiguration.hideMode, 0, 2) == 0
+
+        Component.onCompleted: {
+            strutManager.updateStrut()
+        }
+    }
 }

=== modified file 'shell/launcher/LauncherLoader.qml'
--- shell/launcher/LauncherLoader.qml	2012-01-19 08:17:06 +0000
+++ shell/launcher/LauncherLoader.qml	2012-01-24 15:19:26 +0000
@@ -1,4 +1,5 @@
 import QtQuick 1.0
+import Unity2d 1.0
 import "../common"
 import "../common/utils.js" as Utils