Merge lp:~agateau/unity-2d/add-launcher-maximum-width-property into lp:unity-2d/3.0

[Aurélien Gâteau]

[launcher] Add the MaximumWidth property to the launcher.

This can then be used by the Dash and the Spread to position themselves so that they do not overlap with the launcher.

Add the MaximumWidth property to the launcher.

This can then be used by the Dash and the Spread to position themselves so that they do not overlap with the launcher.

[lp:~agateau/unity-2d/add-launcher-maximum-width-property]

452. By Aurélien Gâteau on 2011-03-15

Merged from trunk

[Ugo Riboni (uriboni)]

Can you please add a comment where you return width() saying that due to the fact we set maximumWidth somewhere else the value returned is going to be always the maximum width regardless of the current width of the launcher ?

I think it will help to clarify.

Other than that it's good and works fine.

Please set it to Approved yourself when you have added the comment. Thank you.

[Aurélien Gâteau (agateau)]

Makes sense. Fixed, pushed and approved.

review: Approve

[lp:~agateau/unity-2d/add-launcher-maximum-width-property]

453. By Aurélien Gâteau on 2011-03-15

Document why we can use width() to get the maximum width

=== modified file 'launcher/app/launcher.xml'
--- launcher/app/launcher.xml	2011-03-14 13:37:17 +0000
+++ launcher/app/launcher.xml	2011-03-15 17:06:18 +0000
@@ -31,6 +31,10 @@
                hide.
             ]]></dox:d>
         </method>
+
+        <property name="MaximumWidth" type="i" access="read">
+            <dox:d>The width of the launcher when it is fully visible.</dox:d>
+        </property>
     </interface>
 </node>
 

=== modified file 'launcher/app/launcherdbus.cpp'
--- launcher/app/launcherdbus.cpp	2011-03-14 14:06:09 +0000
+++ launcher/app/launcherdbus.cpp	2011-03-15 17:06:18 +0000
@@ -77,3 +77,12 @@
     UQ_RETURN_IF_FAIL(calledFromDBus());
     m_visibilityController->endForceVisible(message().service());
 }
+
+int
+LauncherDBus::maximumWidth() const
+{
+    // The width of the view is set with setFixedWidth(), so asking for the
+    // width() this way returns the maximum width without having to duplicate
+    // the value.
+    return m_view->window()->width();
+}

=== modified file 'launcher/app/launcherdbus.h'
--- launcher/app/launcherdbus.h	2011-03-14 14:06:09 +0000
+++ launcher/app/launcherdbus.h	2011-03-15 17:06:18 +0000
@@ -35,6 +35,7 @@
 class LauncherDBus : public QObject, protected QDBusContext
 {
     Q_OBJECT
+    Q_PROPERTY(int MaximumWidth READ maximumWidth)
 
 public:
     LauncherDBus(VisibilityController* visibilityController, LauncherView* view, QObject* parent=0);
@@ -50,6 +51,8 @@
 private:
     VisibilityController* m_visibilityController;
     LauncherView* m_view;
+
+    int maximumWidth() const;
 };
 
 #endif // LauncherDBus_H