Merge lp:~nik90/ubuntu-ui-toolkit/fix-slider-bubble-width into lp:ubuntu-ui-toolkit/staging

[Nekhelesh Ramananthan]

Fixes the slider bubble width to be dynamic and dependent on the label width.

This MP fixes the slider bubble width to be dynamic and dependent on the label width instead of being static. This would allow the slider bubble to show values like "medium", "slow" etc without it exceeding the bubble width as shown in https://launchpadlibrarian.net/200688179/Screenshot%20at%2022-13-39.png

[lp:~nik90/ubuntu-ui-toolkit/fix-slider-bubble-width]

1456. By Nekhelesh Ramananthan on 2015-03-20

Added two properties

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1456
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1576/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1884/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/303
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/306
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/306/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/303
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1662/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1882
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1882/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19019

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

review: Needs Fixing (continuous-integration)

[Roman Shchekin (mrqtros)]

I think that you should do them private via "__" (double underscore) or internal QtObject. Or you internationally want to show these two new properties to user?

[Nekhelesh Ramananthan (nik90)]

That was my initial thought, but on looking at the other properties in SliderStyle.qml and also at ButtonStyle.qml for reference, they all were not private.

[Tim Peeters (tpeeters)]

bubbleShape is an internal Item for the style, so the added properties are not public. I think it is good like this.

Perhaps you can add a little example of a slider with a larger bubble width in examples/ubuntu-ui-toolkit-gallery/Sliders.qml ?

[lp:~nik90/ubuntu-ui-toolkit/fix-slider-bubble-width]

1457. By Nekhelesh Ramananthan on 2015-03-20

Added a example of a slider with bubble showing lables

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1457
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1581/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1902
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/311
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/311/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1900
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1900/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19051

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

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

It works well, thanks.

Approving. I will happrove it when we finish our final landings from staging to vivid.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Sliders.qml'
--- examples/ubuntu-ui-toolkit-gallery/Sliders.qml	2015-03-03 13:20:06 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Sliders.qml	2015-03-20 21:25:24 +0000
@@ -69,5 +69,30 @@
                 font.weight: Font.Light
             }
         }
+
+        TemplateFlow {
+            title: i18n.tr("Labels")
+
+            Slider {
+                id: longBubbleSlider
+                objectName: "slider_long_bubble"
+                width: parent.width
+                value: 50
+                minimumValue: 0
+                maximumValue: 100
+                function formatValue(v) {
+                    if (v < maximumValue/4)
+                        return i18n.tr("Small")
+                    else if (v < maximumValue/1.5)
+                        return i18n.tr("Medium")
+                    else
+                        return i18n.tr("Large")
+                }
+            }
+            Label {
+                text: i18n.tr("Actual value: %1").arg(longBubbleSlider.value)
+                font.weight: Font.Light
+            }
+        }
     }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2015-03-10 12:16:04 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2015-03-20 21:25:24 +0000
@@ -87,7 +87,10 @@
     BubbleShape {
         id: bubbleShape
 
-        width: units.gu(8)
+        property real minimumWidth: units.gu(8)
+        property real horizontalPadding: units.gu(1)
+
+        width: Math.max(minimumWidth, label.implicitWidth + 2*horizontalPadding)
         height: units.gu(6)
 
         // FIXME: very temporary implementation