Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/clipDelegateLabel into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Move delegate's chevron into the row and size it explicitly

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1564
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2003/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/731
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/733
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/733/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/730

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

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

When the text is too long, can you use Text.elide so that "..." is shown in the end to indicate that not the full text is shown?

review: Needs Fixing

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/clipDelegateLabel]

1565. By Cris Dywan on 2015-07-16

Elide label texts rather than cutting them right off

[Tim Peeters (tpeeters)]

good, thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1565
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2004/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/732
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/734
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/734/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/731

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

review: Approve (continuous-integration)

=== modified file 'examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml'
--- examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml	2015-07-16 11:03:15 +0000
@@ -29,23 +29,24 @@
             anchors.right: parent.right
             spacing: units.gu(3)
 
+            property var model: [
+                i18n.tr("Value 1"),
+                i18n.tr("This is the second value"),
+                i18n.tr("Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat."),
+                i18n.tr("Once upon a time there was a story nobody told."),
+            ]
+
             OptionSelector {
-               objectName: "optionselector_collapsed"
-               text: i18n.tr("Collapsed")
-               model: [i18n.tr("Value 1"),
-                       i18n.tr("Value 2"),
-                       i18n.tr("Value 3"),
-                       i18n.tr("Value 4")]
+                objectName: "optionselector_collapsed"
+                text: i18n.tr("Collapsed")
+                model: parent.model
             }
 
             OptionSelector {
                 objectName: "optionselector_expanded"
                 text: i18n.tr("Expanded")
                 expanded: true
-                model: [i18n.tr("Value 1"),
-                        i18n.tr("Value 2"),
-                        i18n.tr("Value 3"),
-                        i18n.tr("Value 4")]
+                model: parent.model
             }
 
             OptionSelector {
@@ -53,10 +54,7 @@
                 text: i18n.tr("Multiple Selection")
                 expanded: false
                 multiSelection: true
-                model: [i18n.tr("Value 1"),
-                        i18n.tr("Value 2"),
-                        i18n.tr("Value 3"),
-                        i18n.tr("Value 4")]
+                model: parent.model
             }
 
             OptionSelector {

=== modified file 'modules/Ubuntu/Components/1.3/OptionSelectorDelegate.qml'
--- modules/Ubuntu/Components/1.3/OptionSelectorDelegate.qml	2015-04-29 07:21:29 +0000
+++ modules/Ubuntu/Components/1.3/OptionSelectorDelegate.qml	2015-07-16 11:03:15 +0000
@@ -318,48 +318,54 @@
             anchors {
                 verticalCenter: parent.verticalCenter
             }
+            clip: true
+            width: option.width - leftIcon.width - image.width
+                - parent.spacing * 2 - parent.anchors.leftMargin
+
             Label {
                 text: option.text === "" ? modelData : option.text
+                width: parent.width
+                elide: Text.ElideRight
             }
             Label {
                 text: option.subText
+                width: parent.width
+                elide: Text.ElideRight
                 visible: option.subText !== "" ? true : false
                 fontSize: "small"
             }
         }
-    }
-
-    Image {
-        id: image
-
-        width: units.gu(2)
-        height: units.gu(2)
-        source: listView.expanded || listView.multiSelection ? listView.container.tick : listView.container.chevron
-        opacity: option.selected ? 1.0 : 0.0
-        anchors {
-            right: parent.right
-            rightMargin: units.gu(2)
-            verticalCenter: parent.verticalCenter
-        }
-
-        //Our behaviour is only enabled for our expanded list due to flickering bugs in relation to all this other animations running on the expanding version.
-        Behavior on opacity {
-            enabled: listView.expanded
-
-            Toolkit.UbuntuNumberAnimation {
-                properties: "opacity"
-                duration: Toolkit.UbuntuAnimation.FastDuration
-            }
-        }
-
-        ShaderEffect {
-            property color colour: assetColour
-            property Image source: parent
-
-            width: source.width
-            height: source.height
-
-            fragmentShader: fragColourShader
-         }
+
+        Image {
+            id: image
+
+            width: units.gu(2)
+            height: units.gu(2)
+            source: listView.expanded || listView.multiSelection ? listView.container.tick : listView.container.chevron
+            opacity: option.selected ? 1.0 : 0.0
+            anchors {
+                verticalCenter: parent.verticalCenter
+            }
+
+            //Our behaviour is only enabled for our expanded list due to flickering bugs in relation to all this other animations running on the expanding version.
+            Behavior on opacity {
+                enabled: listView.expanded
+
+                Toolkit.UbuntuNumberAnimation {
+                    properties: "opacity"
+                    duration: Toolkit.UbuntuAnimation.FastDuration
+                }
+            }
+
+            ShaderEffect {
+                property color colour: assetColour
+                property Image source: parent
+
+                width: source.width
+                height: source.height
+
+                fragmentShader: fragColourShader
+             }
+        }
     }
 }