Merge lp:~zsombi/ubuntu-ui-toolkit/dialog-size-fix into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Fix Dialog foreground sizing.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1269
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1072/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5363
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/904
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/904
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/904/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/904
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5075
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6615
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6615/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13981

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1072/rebuild

review: Needs Fixing (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1270
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1074/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5369/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/906
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/906
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/906/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/906
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5081/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6621
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6621/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13993

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1074/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/551/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5459
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/495
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/495
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/495/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/495
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6711
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6711/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14096

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
--- modules/Ubuntu/Components/Popups/Dialog.qml	2014-08-27 12:12:06 +0000
+++ modules/Ubuntu/Components/Popups/Dialog.qml	2014-10-01 10:22:47 +0000
@@ -171,7 +171,7 @@
         property real itemSpacing: units.gu(2)
         property Item dismissArea: dialog.dismissArea
 
-        height: Math.min(childrenRect.height, dialog.height)
+        height: Math.min(contentsColumn.height + foreground.margins, dialog.height)
 
         Column {
             id: contentsColumn
@@ -193,6 +193,7 @@
                 elide: Text.ElideRight
                 fontSize: "large"
                 color: UbuntuColors.darkGrey
+                visible: (text !== "")
             }
 
             Label {
@@ -201,6 +202,7 @@
                 fontSize: "medium"
                 color: UbuntuColors.darkGrey
                 wrapMode: Text.Wrap
+                visible: (text !== "")
             }
 
             onChildrenChanged: updateChildrenWidths()

=== modified file 'tests/resources/popover/DialogTest.qml'
--- tests/resources/popover/DialogTest.qml	2014-08-27 13:16:58 +0000
+++ tests/resources/popover/DialogTest.qml	2014-10-01 10:22:47 +0000
@@ -36,9 +36,48 @@
         }
     }
 
-    Button {
-        text: "Open dialog"
-        onClicked: PopupUtils.open(dialog)
-    }
-
+    Component {
+        id: expanding
+        Dialog {
+             id: stylesDialog
+             property real labelwidth: units.gu(11)
+//             title: "Title"
+             //text: "text"
+
+             OptionSelector {
+                  model: ["One", "Two", "Three"]
+             }
+
+             Row {
+                 Label {
+                     text: "Slider"
+                     verticalAlignment: Text.AlignVCenter
+                     width: labelwidth
+                     height: fontScaleSlider.height
+                 }
+
+                 Slider {
+                     id: fontScaleSlider
+                     width: parent.width - labelwidth
+                     minimumValue: 0
+                     maximumValue: 12
+                 }
+             }
+             Button {
+                 text: i18n.tr("Close")
+                 onClicked: PopupUtils.close(stylesDialog)
+             }
+        }
+    }
+
+    Column {
+        Button {
+            text: "Open dialog"
+            onClicked: PopupUtils.open(dialog)
+        }
+        Button {
+            text: "Open expanding dialog"
+            onClicked: PopupUtils.open(expanding)
+        }
+    }
 }