Merge lp:~bzoltan/ubuntu-ui-toolkit/landing-06-08 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

- Ubuntu Shape: store geometry before redrawing can occur so that the geometry is more reliably respected. Fixes: https://bugs.launchpad.net/bugs/1353493
- Square overflow panel style for header pop overs. Fixes: https://bugs.launchpad.net/bugs/1336789

- Ubuntu Shape: store geometry before redrawing can occur so that the geometry is more reliably respected. Fixes: https://bugs.launchpad.net/bugs/1353493
- Square overflow panel style for header pop overs. Fixes: https://bugs.launchpad.net/bugs/1336789

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-04 16:00:57 +0000
+++ debian/changelog	2014-08-06 16:32:29 +0000
@@ -1,3 +1,16 @@
+ubuntu-ui-toolkit (1.1.1181+14.10.20140804-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Florian Boucault ]
+  * Ubuntu Shape: store geometry before redrawing can occur so that 
+    the geometry is more reliably respected. 
+    Fixes: https://bugs.launchpad.net/bugs/1353493
+
+  [ Christian Dywan ]
+  * Square overflow panel style for header pop overs. 
+    Fixes: https://bugs.launchpad.net/bugs/1336789
+ 
+ -- Zoltán Balogh <[e-mail]>  Wed, 06 Aug 2014 19:26:17 +0300
+
 ubuntu-ui-toolkit (1.1.1179+14.10.20140804-0ubuntu1) utopic; urgency=medium
 
   [ Florian Boucault ]
 
=== modified file 'modules/Ubuntu/Components/ListItems/Standard.qml'
--- modules/Ubuntu/Components/ListItems/Standard.qml	2014-05-22 22:56:16 +0000
+++ modules/Ubuntu/Components/ListItems/Standard.qml	2014-08-06 16:32:29 +0000
@@ -197,7 +197,7 @@
         id: iconHelper
 
         width: height
-        height: Math.min(units.gu(5), parent.height - units.gu(1))
+        height: Math.min(units.gu(5), listItem.height - units.gu(1))
         anchors {
             left: parent.left
             leftMargin: listItem.__contentsMargins
 
=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
--- modules/Ubuntu/Components/Popups/Popover.qml	2014-04-25 15:14:18 +0000
+++ modules/Ubuntu/Components/Popups/Popover.qml	2014-08-06 16:32:29 +0000
@@ -127,7 +127,7 @@
       The property holds the margins from the popover's dismissArea. The property
       is themed.
       */
-    property real edgeMargins: units.gu(2)
+    property real edgeMargins: foreground.square ? 0 : units.gu(2)
 
     /*!
       The property holds the margin from the popover's caller. The property
@@ -231,6 +231,7 @@
         property point target: Qt.point(pointer.x - x, pointer.y - y)
         property string direction: pointer.direction
         property bool clipContent: true
+        property bool square: popover.hasOwnProperty("square") ? popover.square : false
 
         signal show()
         signal hide()
 
=== modified file 'modules/Ubuntu/Components/Tabs.qml'
--- modules/Ubuntu/Components/Tabs.qml	2014-06-18 11:49:29 +0000
+++ modules/Ubuntu/Components/Tabs.qml	2014-08-06 16:32:29 +0000
@@ -338,7 +338,7 @@
         function connectToRepeaters(children) {
             for (var i = 0; i < children.length; i++) {
                 var child = children[i];
-                if (internal.isRepeater(child) && (internal.repeaters.indexOf(child) < 0)) {
+                if (internal.isRepeater(child) && internal.repeaters && (internal.repeaters.indexOf(child) < 0)) {
                     internal.connectRepeater(child);
                 }
             }
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2014-05-07 18:06:41 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2014-08-06 16:32:29 +0000
@@ -29,6 +29,7 @@
     // FIXME: This should not be necessary. See
     // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1214978
     property alias arrowSource: arrow.source
+    property bool square: false
 
     implicitWidth: units.gu(10)
     implicitHeight: units.gu(8)
@@ -94,8 +95,10 @@
     BorderImage {
         id: shadow
         anchors.fill: parent
-        anchors.margins: -units.gu(0.5)
-        source: "artwork/bubble_shadow.sci"
+        anchors.margins: square ? -units.gu(1) : -units.gu(0.5)
+        anchors.topMargin: square ? 0 : anchors.margins
+        source: !square ? "artwork/bubble_shadow.sci" : "artwork/header_overflow_dropshadow.sci"
+        opacity: 0.8
     }
 
     UbuntuShape {
@@ -103,13 +106,14 @@
         borderSource: "none"
         color: Theme.palette.normal.overlay
         image: bubbleShape.clipContent ? shapeSource : null
+        visible: !square
     }
 
     ShaderEffectSource {
         id: shapeSource
         visible: bubbleShape.clipContent
         sourceItem: bubbleShape.clipContent ? content : null
-        hideSource: true
+        hideSource: !square
         // FIXME: visible: false prevents rendering so make it a nearly
         // transparent 1x1 pixel instead
         opacity: 0.01
@@ -124,7 +128,7 @@
         Rectangle {
             id: colorRect
             anchors.fill: parent
-            color: Theme.palette.normal.overlay
+            color: square ? Theme.palette.normal.background : Theme.palette.normal.overlay
             visible: bubbleShape.clipContent
         }
     }
@@ -136,7 +140,7 @@
         Image {
             id: arrow
 
-            visible: bubbleShape.direction != "none"
+            visible: !square && bubbleShape.direction != "none"
 
             function directionToRotation(direction) {
                 switch (direction) {
 
=== added file 'modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml	2014-08-06 16:32:29 +0000
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components.Popups 1.0
+
+Popover {
+    property bool square: true
+}
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-07-31 14:09:45 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2014-08-06 16:32:29 +0000
@@ -161,11 +161,14 @@
                 tabsPopover.show();
             }
 
-            Popover {
+            OverflowPanel {
                 id: tabsPopover
                 objectName: "tabsPopover"
                 parent: QuickUtils.rootItem(tabsPopover)
                 caller: tabsButton
+                callerMargin: -units.gu(1) + units.dp(4)
+                contentWidth: units.gu(20)
+
                 Column {
                     anchors {
                         left: parent.left
@@ -174,14 +177,33 @@
                     }
                     Repeater {
                         model: styledItem.tabsModel
-                        ListItem.Standard {
-                            visible: index !== styledItem.tabsModel.selectedIndex
-                            text: tab.title // FIXME: only "title" doesn't work with i18n.tr(). Why not?
+                        AbstractButton {
                             objectName: "tabButton" + index
                             onClicked: {
                                 styledItem.tabsModel.selectedIndex = index;
                                 tabsPopover.hide();
                             }
+                            implicitHeight: units.gu(6) + bottomDividerLine.height
+                            width: parent ? parent.width : units.gu(31)
+
+                            Label {
+                                anchors {
+                                    verticalCenter: parent.verticalCenter
+                                    verticalCenterOffset: units.dp(-1)
+                                    left: parent.left
+                                    leftMargin: units.gu(2)
+                                }
+                                fontSize: "medium"
+                                elide: Text.ElideRight
+                                text: tab.title // FIXME: only "title" doesn't work with i18n.tr(). Why not?
+                                color: '#5d5d5d'
+                            }
+
+                            ListItem.ThinDivider {
+                                id: bottomDividerLine
+                                anchors.bottom: parent.bottom
+                                visible: index < styledItem.tabsModel.count - 1
+                            }
                         }
                     }
                 }
@@ -296,11 +318,13 @@
             height: actionsContainer.height
             onTriggered: actionsOverflowPopover.show()
 
-            Popover {
+            OverflowPanel {
                 id: actionsOverflowPopover
                 objectName: "actions_overflow_popover"
                 parent: QuickUtils.rootItem(actionsOverflowPopover)
                 caller: actionsOverflowButton
+                callerMargin: -units.gu(1) + units.dp(4)
+                contentWidth: units.gu(20)
 
                 // Ensure the popover closes when actions change and
                 // the list item below may be destroyed before its
@@ -326,11 +350,47 @@
                         right: parent.right
                     }
                     Repeater {
+                        id: overflowRepeater
                         model: numberOfSlots.requested - numberOfSlots.used
-                        ListItem.Standard {
+                        AbstractButton {
                             action: actionsContainer.visibleActions[numberOfSlots.used + index]
                             objectName: action.objectName + "_header_overflow_button"
                             onClicked: actionsOverflowPopover.hide()
+                            implicitHeight: units.gu(6) + bottomDividerLine.height
+                            width: parent ? parent.width : units.gu(31)
+
+                            Icon {
+                                id: actionIcon
+                                name: action.iconName
+                                color: '#5d5d5d'
+                                anchors {
+                                    verticalCenter: parent.verticalCenter
+                                    verticalCenterOffset: units.dp(-1)
+                                    left: parent.left
+                                    leftMargin: units.gu(2)
+                                }
+                                width: units.gu(2)
+                                height: units.gu(2)
+                            }
+
+                            Label {
+                                anchors {
+                                    verticalCenter: parent.verticalCenter
+                                    verticalCenterOffset: units.dp(-1)
+                                    left: actionIcon.right
+                                    leftMargin: units.gu(2)
+                                }
+                                fontSize: "small"
+                                elide: Text.ElideRight
+                                text: action.text
+                                color: '#5d5d5d'
+                            }
+
+                            ListItem.ThinDivider {
+                                id: bottomDividerLine
+                                anchors.bottom: parent.bottom
+                                visible: index !== overflowRepeater.count - 1
+                            }
                         }
                     }
                 }
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml	2013-07-31 12:16:52 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml	2014-08-06 16:32:29 +0000
@@ -22,6 +22,7 @@
     target: styledItem.target
     direction: styledItem.direction
     clipContent: styledItem.clipContent
+    square: styledItem.square
 
     onShowCompleted: styledItem.showCompleted()
     onHideCompleted: styledItem.hideCompleted()
 
=== added file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]'
 Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	1970-01-01 00:00:00 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	2014-08-06 16:32:29 +0000 differ
=== added file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]'
--- modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/artwork/[e-mail]	2014-08-06 16:32:29 +0000
@@ -0,0 +1,5 @@
+border.left: 27
+border.top: 27
+border.bottom: 27
+border.right: 27
+source: [e-mail]
 \ No newline at end of file
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/qmldir'
--- modules/Ubuntu/Components/Themes/Ambiance/qmldir	2014-07-22 14:20:08 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/qmldir	2014-08-06 16:32:29 +0000
@@ -49,3 +49,4 @@
 
 internal TextSelectionStartCursorStyle TextSelectionStartCursorStyle.qml
 internal TextSelectionEndCursorStyle TextSelectionEndCursorStyle.qml
+internal OverflowPanel OverflowPanel.qml
 
=== modified file 'modules/Ubuntu/Components/plugin/shapeitem.cpp'
--- modules/Ubuntu/Components/plugin/shapeitem.cpp	2014-08-04 12:53:59 +0000
+++ modules/Ubuntu/Components/plugin/shapeitem.cpp	2014-08-06 16:32:29 +0000
@@ -408,9 +408,9 @@
 
 void ShapeItem::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry)
 {
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
     geometry_ = newGeometry;
     dirtyFlags_ |= ShapeItem::DirtyGeometry;
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
     update();
 }
 
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2014-07-23 13:27:09 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2014-08-06 16:32:29 +0000
@@ -181,7 +181,7 @@
 
         try:
             tab_button = self.get_root_instance().select_single(
-                'Standard', objectName='tabButton' + str(index))
+                objectName='tabButton' + str(index))
         except dbus.StateNotFoundError:
             raise _common.ToolkitException(
                 "Tab button {0} not found.".format(index))
@@ -229,8 +229,7 @@
 
         # the popover is not a child of the header, so use the root object
         # to find the requested button
-        return self.get_root_instance().select_single(
-            'Standard', objectName=object_name)
+        return self.get_root_instance().select_single(objectName=object_name)
 
 
 class Header(AppHeader):
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py	2014-07-17 06:38:04 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py	2014-08-06 16:32:29 +0000
@@ -51,7 +51,6 @@
 
         """
         overflow_popover = self.main_view.select_single(
-            'Popover',
             objectName='actions_overflow_popover')
         self.header.click_action_button('pushStackAction')
         self.assertThat(overflow_popover.visible, Eventually(Equals(False)))