Merge lp:~phablet-team/webbrowser-app/fix-add-tab-label-width into lp:webbrowser-app

[Ugo Riboni]

Fix add tab label to be readable in most localizations.

Fix add tab label to be readable in most localizations

[Olivier Tilloy (osomon)]

That doesn’t look right, now the button doesn’t look aligned to the right anymore (it seems the additional space goes to the right of the button, resulting in an awkward margin).

review: Needs Fixing

[lp:~phablet-team/webbrowser-app/fix-add-tab-label-width]

719. By Ugo Riboni on 2014-09-24

Make the item as wide as it needs to be to fix the text instead of a fixed width

[Olivier Tilloy (osomon)]

That looks much better now, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:718
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1102/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3753
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/301
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/301/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4891
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6398
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6398/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13688
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4064
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4064/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1102/rebuild

review: Approve (continuous-integration)

=== modified file 'src/app/webbrowser/HistoryView.qml'
--- src/app/webbrowser/HistoryView.qml	2014-08-05 02:50:21 +0000
+++ src/app/webbrowser/HistoryView.qml	2014-09-24 16:24:58 +0000
@@ -108,7 +108,6 @@
                 verticalCenter: parent.verticalCenter
             }
             height: parent.height - units.gu(2)
-            width: height
 
             text: i18n.tr("Clear")
 

=== modified file 'src/app/webbrowser/TabsView.qml'
--- src/app/webbrowser/TabsView.qml	2014-08-21 08:02:21 +0000
+++ src/app/webbrowser/TabsView.qml	2014-09-24 16:24:58 +0000
@@ -110,7 +110,6 @@
                 verticalCenter: parent.verticalCenter
             }
             height: parent.height - units.gu(2)
-            width: height
 
             text: i18n.tr("Add")
 

=== modified file 'src/app/webbrowser/ToolbarAction.qml'
--- src/app/webbrowser/ToolbarAction.qml	2014-07-29 22:00:59 +0000
+++ src/app/webbrowser/ToolbarAction.qml	2014-09-24 16:24:58 +0000
@@ -24,6 +24,7 @@
     property alias text: label.text
 
     opacity: enabled ? 1.0 : 0.3
+    width: label.paintedWidth
 
     Item {
         anchors {
@@ -50,8 +51,7 @@
         id: label
         anchors {
             bottom: parent.bottom
-            left: parent.left
-            right: parent.right
+            horizontalCenter: parent.horizontalCenter
         }
         horizontalAlignment: Text.AlignHCenter
         fontSize: "x-small"