Merge lp:~tpeeters/ubuntu-ui-toolkit/30-landscapeToolbar into lp:ubuntu-ui-toolkit/staging

[Tim Peeters]

Reduce toolbar height on phone in landscape orientation.

Reviewed visuals on phone with Olga, Ben at the sprint.

[lp:~tpeeters/ubuntu-ui-toolkit/30-landscapeToolbar]

1775. By Tim Peeters on 2015-12-16

link bug

[Zsombor Egri (zsombi)]

Pretty mucha no-brainer :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarStyle.qml	2015-12-15 13:41:28 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarStyle.qml	2015-12-16 10:53:56 +0000
@@ -14,13 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
+import QtQuick.Window 2.2
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Styles 1.3 as Style
 
 Style.ToolbarStyle {
     id: toolbarStyle
     implicitWidth: parent ? parent.width : 0
-    implicitHeight: units.gu(4)
+    // reduce toolbar height on phone in landscape orientation:
+    implicitHeight: Screen.height > units.gu(50) ? units.gu(4) : units.gu(3)
 
     /*!
       The default action delegate if the styled item does