Merge lp:~3v1n0/component-store/radial-expand-angle into lp:component-store

[Marco Trevisan (Treviño)]

RadialBottomEdge: make possible to expand actions in a narrower angle

And update expandedPosition depending on this value

I'd like to dispose actions using a narower expand-angle when I've just few actions to add... Changing expandAngle to something minor to 360, you'd be able to dispose actions using a smaller area.

Here's what happens adding 3 or 4 actions with a 180° expandAngle: http://imgur.com/a/aLqVU

[Nekhelesh Ramananthan (nik90)]

Thanks Marco for the patch. The component code looks good. The documentation needs to be updated. I have done that for you at https://code.launchpad.net/~nik90/component-store/update-radial-docs/+merge/253622. Please merge that into this branch and then I can top-approve this MP.

review: Needs Fixing

[lp:~3v1n0/component-store/radial-expand-angle]

47. By Marco Trevisan (Treviño) on 2015-03-20

Merging with nick90's docs

Thanks!

[Marco Trevisan (Treviño) (3v1n0)]

Merged, thanks.

review: Approve

=== modified file 'ComponentStore/RadialBottomEdge/RadialBottomEdge.qml'
--- ComponentStore/RadialBottomEdge/RadialBottomEdge.qml	2014-11-15 14:50:47 +0000
+++ ComponentStore/RadialBottomEdge/RadialBottomEdge.qml	2015-03-20 10:21:42 +0000
@@ -11,7 +11,8 @@
     property color hintIconColor: UbuntuColors.coolGrey
     property bool bottomEdgeEnabled: true
 
-    property real expandedPosition: 0.6 * height
+    property int expandAngle: 360
+    property real expandedPosition: (0.85 - 0.25 * expandAngle/360) * height
     property real collapsedPosition: height - hintSize/2
 
     property list<RadialAction> actions
@@ -60,10 +61,13 @@
 
         Repeater {
             id: actionList
+            readonly property real itemSpace: bottomEdge.expandAngle/actionList.count;
+            readonly property real substractAngle: (bottomEdge.expandAngle == 360 || !actionList.count) ?
+                                                    0 : (actionList.count-1)/2 * itemSpace
             model: actions
             delegate: Rectangle {
                 id: actionDelegate
-                readonly property real radAngle: (index % actionList.count * (360/actionList.count)) * Math.PI / 180
+                readonly property real radAngle: (index % actionList.count * actionList.itemSpace - actionList.substractAngle) * Math.PI / 180
                 property real distance: bottomEdgeHint.actionListDistance
                 z: -1
                 width: actionButtonSize

=== modified file 'ComponentStore/RadialBottomEdge/ubuntu_component_store.json'
--- ComponentStore/RadialBottomEdge/ubuntu_component_store.json	2015-01-04 16:15:59 +0000
+++ ComponentStore/RadialBottomEdge/ubuntu_component_store.json	2015-03-20 10:21:42 +0000
@@ -1,6 +1,6 @@
 {
     "name": "RadialBottomEdge",
     "description": "This component provides a unique way to show actions buttons using the bottom edge. It allows app developers to decide how many actions they want to show and customize it to their liking.",
-    "version": "1.0",
+    "version": "1.1",
     "documentation_url": "http://ubuntu-component-store.readthedocs.org/en/latest/_components/radialbottomedge.html"
 }

=== modified file 'docs/_components/radialbottomedge.rst'
--- docs/_components/radialbottomedge.rst	2014-11-15 14:59:11 +0000
+++ docs/_components/radialbottomedge.rst	2015-03-20 10:21:42 +0000
@@ -74,6 +74,7 @@
 - :ref:`actions`: RadialAction <list> 
 - :ref:`actionButtonSize`: int
 - :ref:`actionButtonDistance`: int
+- :ref:`expandAngle`: int (defaults to 360 deg)
 
 .. note:: All properties except for *hintIconSource* have well defined defaults. As a developer, you could choose to go with the defaults or change them to your liking.
 
@@ -156,3 +157,13 @@
 ^^^^^^^^^^^^^^^^^^^^
 
 The distance (separation) between the action buttons and the center of the radial menu.
+
+.. _expandAngle:
+
+expandAngle
+^^^^^^^^^^^
+
+The expand angle defines the spread angle. By default, it is set to 360 degrees which places the buttons
+in a full circle pattern. If it was set to 180 degrees, then the buttons would follow a semi-circle
+pattern.
+

=== modified file 'docs/release.rst'
--- docs/release.rst	2015-03-13 11:18:34 +0000
+++ docs/release.rst	2015-03-20 10:21:42 +0000
@@ -1,6 +1,7 @@
 Release Notes
 =============
 
+<<<<<<< TREE
 **13th March 2015**
 
 * Improved ListItemWithActions components by adding the following new properties,
@@ -9,6 +10,12 @@
   * showUnderscore - Shows an underscore under the active right side action
   * enableHaptics - enables haptic effects on actions triggered
 
+=======
+**11th March 2015**
+
+* Added expandAngle property to radial bottom edge component to allow developers to specify the spread angle.
+
+>>>>>>> MERGE-SOURCE
 **3rd March 2015**
 
 * Added WelcomeWizard component